modified: ../requirements.txt

	modified:   analysis/reproduce/utils.py

Author: vsoch

requirements.txt

@@ -1,5 +1,6 @@
 pandas
 python-dateutil
+demjson
 requests
 requests-toolbelt
 retrying

singularity/analysis/reproduce/utils.py

@@ -27,7 +27,7 @@
 '''
 
 from singularity.cli import Singularity
-from .criteria import assess_content
+from .criteria import assess_content, include_file
 from singularity.logger import bot
 import hashlib
 import tarfile

singularity/package/utils.py

@@ -89,7 +89,7 @@ def zip_up(file_list,zip_name,output_folder=None):
             os.remove(filey)
 
         # If it's a string, do the same
-        elif isinstance(content,str):
+        elif isinstance(content,str) or filename.endswith('json'):
             filey = write_file("%s/%s" %(tmpdir,filename),content)
             zf.write(filey,filename)
             os.remove(filey)

singularity/tests/test_reproduce.py

@@ -133,7 +133,7 @@ def test_get_content_hashes(self):
 
 
     def test_extract_guts(self):
-        from singularity.analysis.utils import extract_guts
+        from singularity.analysis.reproduce.utils import extract_guts
         from singularity.analysis.reproduce import (
             get_memory_tar,
             get_levels )