[ARVADOS] updated: a605fc29fd7f79b2882625c99a72e998157fa5bc

Git user git at public.curoverse.com
Thu Oct 6 16:50:21 EDT 2016


Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  a605fc29fd7f79b2882625c99a72e998157fa5bc (commit)
      from  74ec5b86db46257f75ea1eb94c136ce18e65c906 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a605fc29fd7f79b2882625c99a72e998157fa5bc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Oct 6 16:50:16 2016 -0400

    Enumerate Directory contents in output when --compute-checksum is
    provided (needed to pass CWL conformance tests).  No issue #

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 46850b3..c90f890 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -32,7 +32,7 @@ from .perf import Perf
 from .pathmapper import FinalOutputPathMapper
 
 from cwltool.pack import pack
-from cwltool.process import shortname, UnsupportedRequirement
+from cwltool.process import shortname, UnsupportedRequirement, getListing
 from cwltool.pathmapper import adjustFileObjs, adjustDirObjs
 from cwltool.draft2tool import compute_checksums
 from arvados.api import OrderedJsonModel
@@ -365,6 +365,7 @@ class ArvCwlRunner(object):
             self.make_output_collection(self.output_name, self.final_output)
 
         if kwargs.get("compute_checksum"):
+            adjustDirObjs(self.final_output, partial(getListing, self.fs_access))
             adjustFileObjs(self.final_output, partial(compute_checksums, self.fs_access))
 
         return self.final_output

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list