updating packages

Author: vsoch

singularity/cli/main/__init__.py

@@ -24,7 +24,6 @@
 
 '''
 
-import singularity
 import argparse
 import sys
 import os
@@ -44,7 +43,6 @@ def get_parser():
                         help="If using Docker or shub image, you can change size (default is 1024)", 
                         type=int, default=1024)
 
-
     subparsers = parser.add_subparsers(help='shub actions',
                                        title='actions',
                                        description='actions for Singularity Hub tools',
@@ -170,7 +168,6 @@ def main():
 
     parser = get_parser()
     subparsers = get_subparsers(parser)
-    print("Singularity Python Version: %s" % singularity.__version__)
 
     try:
         args = parser.parse_args()
@@ -183,6 +180,11 @@ def main():
     # if environment logging variable not set, make silent
     if args.debug is False:
         os.environ['MESSAGELEVEL'] = "CRITICAL"
+    
+    # Always print the version
+    from singularity.logger import bot
+    import singularity
+    bot.info("Singularity Python Version: %s" % singularity.__version__)
 
     if args.command == "create":
         from .create import main

singularity/package/build.py

@@ -112,7 +112,6 @@ def build_from_spec(spec_file=None,
 def package(image_path,
             spec_path=None,
             output_folder=None,
-            software=True,
             remove_image=False,
             verbose=False,
             S=None):
@@ -155,12 +154,11 @@ def package(image_path,
         bot.warning("Trouble extracting container metadata with inspect.")
 
 
-    if software == True:
-        bot.info("Adding software list to package.")
-        files = [x.path for x in members if x.isfile()]
-        folders = [x.path for x in members if x.isdir()]
-        to_package["files.txt"] = files
-        to_package["folders.txt"] = folders
+    bot.info("Adding software list to package.")
+    files = [x.path for x in members if x.isfile()]
+    folders = [x.path for x in members if x.isdir()]
+    to_package["files.txt"] = files
+    to_package["folders.txt"] = folders
 
     # Do zip up here - let's start with basic structures
     zipfile = zip_up(to_package,zip_name=zip_name,output_folder=output_folder)

singularity/tests/data/README

@@ -2,8 +2,18 @@
 
 The cirros and busybox images were produced with Singularity 2.4, which has a much smaller image footprint. The file extractions for the package are from 2016, and were remade as one had become corrupt. More evidence for squashfs
 
+Singularity Python version 1.2.1 with Singularity Version 2.4
+
+## Images
 ```
 sudo singularity build cirros-2017-10-21.simg docker://cirros
 sudo singularity build busybox-2017-10-21.simg docker://busybox
+```
+
+## Packages
 
+
+```
+shub package --image cirros-2017-10-21.simg
+shub package --image busybox-2017-10-21.simg
 ```

singularity/tests/data/busybox-2016-02-16.img.zip

@@ -58,8 +58,8 @@ def setUp(self):
         self.tmpdir = tempfile.mkdtemp()
         self.image1 = "%s/tests/data/busybox-2017-10-21.simg" %(self.pwd)
         self.image2 = "%s/tests/data/cirros-2017-10-21.simg" %(self.pwd)
-        self.pkg1 = "%s/tests/data/busybox-2016-02-16.img.zip" %(self.pwd)
-        self.pkg2 = "%s/tests/data/cirros-2016-01-04.img.zip" %(self.pwd)
+        self.pkg1 = "%s/tests/data/busybox-2017-10-21.zip" %(self.pwd)
+        self.pkg2 = "%s/tests/data/cirros-2017-10-21.zip" %(self.pwd)
 
 
     def tearDown(self):
@@ -72,21 +72,14 @@ def test_packaging(self):
         self.pkg1_includes = list_package(self.pkg1)
         self.pkg2_includes = list_package(self.pkg2)
 
-        includes = ['files.txt', 'VERSION', 'NAME', 'folders.txt']
+        includes = ['files.txt', 'runscript', 'folders.txt'] # VERSION only with spec_file
         for pkg_includes in [self.pkg1_includes,self.pkg2_includes]:
             [self.assertTrue(x in pkg_includes) for x in includes]
-        self.assertTrue(os.path.basename(self.image1) in self.pkg1_includes)
-        self.assertTrue(os.path.basename(self.image2) in self.pkg2_includes)
 
         print("TESTING loading packages...")
         pkg1_loaded = load_package(self.pkg1)
-        self.assertTrue(len(pkg1_loaded["files.txt"])==12)
-        self.assertTrue(len(pkg1_loaded["folders.txt"])==18)
- 
-        # Did it extract successfully?
-        image1_extraction = pkg1_loaded[os.path.basename(self.image1)]
-        self.assertTrue(os.path.exists(image1_extraction))
-        shutil.rmtree(os.path.dirname(image1_extraction))
+        self.assertEqual(len(pkg1_loaded["files.txt"]),20)
+        self.assertEqual(len(pkg1_loaded["folders.txt"]),20)