[ARVADOS] updated: 33f91bb5a4ed93e9cadf21920526daa53351dbea

Git user git at public.curoverse.com
Fri Aug 11 11:10:36 EDT 2017


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

       via  33f91bb5a4ed93e9cadf21920526daa53351dbea (commit)
       via  6e2df2d9a6578e60de4698a37a0b506004f76416 (commit)
      from  a6607cd8ce8f22da697af64354cad54c1acce74f (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 33f91bb5a4ed93e9cadf21920526daa53351dbea
Merge: a6607cd 6e2df2d
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Aug 11 11:10:11 2017 -0400

    Merge branch '12100-cwltool-update' closes #12100
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 6e2df2d9a6578e60de4698a37a0b506004f76416
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Aug 9 16:30:19 2017 -0400

    12100: Bump cwltool for v1.0.2 secondaryFile handling.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curoverse.com>

diff --git a/sdk/cwl/arvados_cwl/arvtool.py b/sdk/cwl/arvados_cwl/arvtool.py
index 35a068f..b667dac 100644
--- a/sdk/cwl/arvados_cwl/arvtool.py
+++ b/sdk/cwl/arvados_cwl/arvtool.py
@@ -15,7 +15,7 @@ class ArvadosCommandTool(CommandLineTool):
         self.arvrunner = arvrunner
         self.work_api = kwargs["work_api"]
 
-    def makeJobRunner(self, use_container=True):
+    def makeJobRunner(self, **kwargs):
         if self.work_api == "containers":
             return ArvadosContainer(self.arvrunner)
         elif self.work_api == "jobs":
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 572519f..9c0e9e0 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -51,7 +51,7 @@ setup(name='arvados-cwl-runner',
       # Note that arvados/build/run-build-packages.sh looks at this
       # file to determine what version of cwltool and schema-salad to build.
       install_requires=[
-          'cwltool==1.0.20170727112954',
+          'cwltool==1.0.20170810192106',
           'schema-salad==2.6.20170712194300',
           'typing==3.5.3.0',
           'ruamel.yaml==0.13.7',

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list