testing adding size estimation back

Author: vsoch

singularity/build/main.py

@@ -11,7 +11,7 @@
 
 from singularity.package import (
     build_from_spec, 
-    #estimate_image_size,
+    estimate_image_size,
     package
 )
 
@@ -94,21 +94,23 @@ def run_build(build_dir,params,verbose=True):
 
         # If size is None, set default of 800
         if params['size'] in [None,'']:
-            bot.logger.info("""\n\n--------------------------------------------------------------
+            bot.logger.info("""\n
+                            --------------------------------------------------------------
                             Size not detected for build. Will use default of 800MB padding. If 
                             your build fails due to running out of disk space, you can adjust the
                             size under collection --> edit builder
                             ---------------------------------------------------------------------
                             \n""")
 
-            params['size'] = 800
-
-            # In future we can possibly add this back.
-            #params['size'] = estimate_image_size(spec_file=os.path.abspath(params['spec_file']),
-            #                                     sudopw='',
-            #                                     padding=params['padding'])
-            #bot.logger.info("Size estimated as %s",params['size'])  
-
+            # Testing estimation of size
+            try:
+                params['size'] = estimate_image_size(spec_file=os.path.abspath(params['spec_file']),
+                                                     sudopw='',
+                                                     padding=params['padding'])
+                bot.logger.info("Size estimated as %s",params['size'])  
+            except:
+                params['size'] = 800
+                bot.logger.info("Size estimation didn't work, using default %s",params['size'])  
 
         # START TIMING
         start_time = datetime.now()

singularity/package.py

@@ -39,12 +39,14 @@ def estimate_image_size(spec_file,sudopw=None,padding=None):
 
     image_folder = build_from_spec(spec_file=spec_file, # default will package the image
                                    sudopw=sudopw, # with root should not need sudo
-                                   build_folder=True)
+                                   build_folder=True,
+                                   debug=False)
     original_size = calculate_folder_size(image_folder)
 
     bot.logger.debug("Original image size calculated as %s",original_size)
     padded_size = original_size + padding
     bot.logger.debug("Size with padding will be %s",padded_size)
+    shutil.rmtree(image_folder)
     return padded_size
 
 

singularity/version.py

@@ -1,4 +1,4 @@
-__version__ = "1.0.2"
+__version__ = "1.0.3"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = '[email protected]'
 NAME = 'singularity'