[ARVADOS] updated: 071cbfb5b1b9328d0db5d4e4c07fd0c8d604c39e

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 7 ++++---
 sdk/cwl/setup.py                | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

       via  071cbfb5b1b9328d0db5d4e4c07fd0c8d604c39e (commit)
      from  648aaa04080e11b0a793d6100260770b878b24c0 (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 071cbfb5b1b9328d0db5d4e4c07fd0c8d604c39e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Mar 9 15:32:52 2016 -0500

    8636: Fix ArvPathMapper.reversemap to return a tuple as expected by caller.
    Improve job reuse by setting minimum_script_version.  refs #8636

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 8854971..7b1c291 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -156,7 +156,8 @@ class ArvadosJob(object):
             response = self.arvrunner.api.jobs().create(body={
                 "script": "crunchrunner",
                 "repository": "arvados",
-                "script_version": "8488-cwl-crunchrunner-collection",
+                "script_version": "master",
+                "minimum_script_version": "9e5b98e8f5f4727856b53447191f9c06e3da2ba6",
                 "script_parameters": {"tasks": [script_parameters], "crunchrunner": crunchrunner_pdh+"/crunchrunner"},
                 "runtime_constraints": runtime_constraints
             }, find_or_create=kwargs.get("enable_reuse", True)).execute(num_retries=self.arvrunner.num_retries)
@@ -266,9 +267,9 @@ class ArvPathMapper(cwltool.pathmapper.PathMapper):
 
     def reversemap(self, target):
         if target.startswith("keep:"):
-            return target
+            return (target, target)
         elif self.keepdir and target.startswith(self.keepdir):
-            return "keep:" + target[len(self.keepdir)+1:]
+            return (target, "keep:" + target[len(self.keepdir)+1:])
         else:
             return super(ArvPathMapper, self).reversemap(target)
 
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index cdbb41b..cacfc21 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -30,7 +30,7 @@ setup(name='arvados-cwl-runner',
           'bin/arvados-cwl-runner'
       ],
       install_requires=[
-          'cwltool>=1.0.20160302134341',
+          'cwltool>=1.0.20160308152645',
           'arvados-python-client>=0.1.20160219154918'
       ],
       zip_safe=True,

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


hooks/post-receive
--