Merge branch '0.6.x' into 'master'

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.6.3 (???)
+-----------
+
+Bugfixes:
+* Fixes reprounzip-vistrails failing because of reporting
+* Fixes invalid escaping in VisTrails XML workflow
+* Fixes docker run failing to read Docker's JSON output on Python 3
+
 0.6.2 (2015-03-16)
 ------------------
 

reprounzip-docker/reprounzip/unpackers/docker.py

@@ -348,7 +348,7 @@ def docker_run(args):
 
     # Get exit status from "docker inspect"
     out = subprocess.check_output(['docker', 'inspect', container])
-    outjson = json.loads(out)
+    outjson = json.loads(out.decode('ascii'))
     if (outjson[0]["State"]["Running"] is not False or
             outjson[0]["State"]["Paused"] is not False):
         logging.error("Invalid container state after execution:\n%s",

reprounzip-vistrails/reprounzip/plugins/vistrails.py

@@ -53,6 +53,12 @@ def hexdigest(self):
         return self._hash.hexdigest()
 
 
+def escape_xml(s):
+    """Escapes for XML.
+    """
+    return s.replace('&', '&').replace('"', '"')
+
+
 def hash_experiment_run(run):
     """Generates a unique id from a single run of an experiment.
 
@@ -94,8 +100,8 @@ def do_vistrails(target):
                 vistrail = vistrail.format(
                         date='2014-11-12 15:31:18',
                         unpacker=unpacker,
-                        directory=escape(str(target.absolute())),
-                        cmdline=escape(cmdline),
+                        directory=escape_xml(str(target.absolute())),
+                        cmdline=escape_xml(cmdline),
                         module_name=module_name,
                         run=i)
                 fp.write(vistrail)

reprounzip/reprounzip/common.py

@@ -365,7 +365,8 @@ def enable_usage_report(enable):
 def record_usage(**kwargs):
     """Records some info in the current usage report.
     """
-    _usage_report.note(kwargs)
+    if _usage_report is not None:
+        _usage_report.note(kwargs)
 
 
 def record_usage_package(runs, packages, other_files, pack_id=None):

reprozip/reprozip/common.py

@@ -365,7 +365,8 @@ def enable_usage_report(enable):
 def record_usage(**kwargs):
     """Records some info in the current usage report.
     """
-    _usage_report.note(kwargs)
+    if _usage_report is not None:
+        _usage_report.note(kwargs)
 
 
 def record_usage_package(runs, packages, other_files, pack_id=None):