Merge branch '12100-cwltool-update' closes #12100

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvtool.py b/sdk/cwl/arvados_cwl/arvtool.py
index 35a068f91be7b28b7eebd0f32538e9222367d8a1..b667dac1ca5cec6f272c390be8fcd17e1628764c 100644 (file)
--- 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 572519fdcf7e6c45218e8e2352366a90eb87564c..9c0e9e0f52c37d61bb3acca57bbb45b659446fcd 100644 (file)
--- 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',