final tweaks

Author: vsoch

singularity/analysis/apps.py

@@ -36,7 +36,6 @@
 
 def extract_apps(image, app_names):
     ''' extract app will extract metadata for one or more apps
-     
         Parameters
         ==========
         image: the absolute path to the image
@@ -45,28 +44,24 @@ def extract_apps(image, app_names):
     '''
     apps = dict()
 
-    if not isinstance(app_names,list):
+    if isinstance(app_names, tuple):
+        app_names = list(app_names)
+    if not isinstance(app_names, list):
         app_names = [app_names]
-
     if len(app_names) == 0:
         return apps
 
     for app_name in app_names:
-
         metadata = dict()
 
         # Inspect: labels, env, runscript, tests, help
-
         try:
             inspection = json.loads(Client.inspect(image, app=app_name))
             del inspection['data']['attributes']['deffile']
             metadata['inspect'] = inspection
 
         # If illegal characters prevent load, not much we can do
-
         except:
             pass
-
         apps[app_name] = metadata
-
     return apps

singularity/build/google.py

@@ -236,27 +236,23 @@ def run_build(logfile='/tmp/.shub-log'):
                             params=params)
 
     # Output includes:
-    image_package = output['image_package']
     finished_image = output['image']
     metadata = output['metadata']  
     params = output['params']  
 
     # Upload image package files to Google Storage
-    if os.path.exists(image_package):
-        bot.info("Package %s successfully built" %image_package)
+    if os.path.exists(finished_image):
+        bot.info("%s successfully built" %finished_image)
         dest_dir = tempfile.mkdtemp(prefix='build')
-        with zipfile.ZipFile(image_package) as zf:
-            zf.extractall(dest_dir)
 
         # The path to the images on google drive will be the github url/commit folder
         trailing_path = "%s/%s" %(params['commit'], params['version'])
         image_path = get_image_path(params['repo_url'], trailing_path) 
                                                          # commits are no longer unique
                                                          # storage is by commit
 
-        build_files = glob("%s/*" %(dest_dir))
-        build_files.append(finished_image)
-        bot.info("Sending build files to storage:") 
+        build_files = [finished_image]
+        bot.info("Sending image to storage:") 
         bot.info('\n'.join(build_files))
 
         # Start the storage service, retrieve the bucket

singularity/build/main.py

@@ -31,13 +31,13 @@
 
 from spython.main import Client
 
+from singularity.analysis.apps import extract_apps
 from singularity.build.utils import (
     stop_if_result_none,
     get_singularity_version,
     test_container
 )
 
-
 from singularity.analysis.reproduce import get_image_file_hash
 from singularity.utils import download_repo
 
@@ -129,6 +129,10 @@ def run_build(build_dir, params, verbose=True):
         params['version'] = version
         pickle.dump(params, open(passing_params,'wb'))
 
+        # Rename image to be hash
+        finished_image = "%s/%s.simg" %(os.path.dirname(image), version)
+        image = shutil.move(image, finished_image)
+
         final_time = (datetime.now() - start_time).seconds
         bot.info("Final time of build %s seconds." %final_time)  
 
@@ -140,10 +144,14 @@ def run_build(build_dir, params, verbose=True):
 
         # Get singularity version
         singularity_version = Client.version()
+        Client.debug = False
         inspect = Client.inspect(image) # this is a string
+        Client.debug = params['debug']
 
         # Get information on apps
+        Client.debug = False
         app_names = Client.apps(image)
+        Client.debug = params['debug']
         apps = extract_apps(image, app_names)
 
         metrics = {'build_time_seconds': final_time,