[ARVADOS] updated: 19aca702ed17c7c89a5ba7d828a77105131e54db
Git user
git at public.curoverse.com
Wed Sep 7 16:53:21 EDT 2016
Summary of changes:
sdk/cwl/arvados_cwl/__init__.py | 3 ++-
sdk/cwl/setup.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
via 19aca702ed17c7c89a5ba7d828a77105131e54db (commit)
from 96185e5347e2303d0b5215ed61bd59c0f2bc84a1 (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 19aca702ed17c7c89a5ba7d828a77105131e54db
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Sep 7 16:53:10 2016 -0400
Don't pass work_api twice in ArvadosCommandTool constructor. Bump arvados-python-client minimum dependency because tests depend on it. refs #9944
diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 0d0d416..65a36f6 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -61,7 +61,8 @@ class ArvCwlRunner(object):
def arvMakeTool(self, toolpath_object, **kwargs):
if "class" in toolpath_object and toolpath_object["class"] == "CommandLineTool":
- return ArvadosCommandTool(self, toolpath_object, work_api=self.work_api, **kwargs)
+ kwargs["work_api"] = self.work_api
+ return ArvadosCommandTool(self, toolpath_object, **kwargs)
else:
return cwltool.workflow.defaultMakeTool(toolpath_object, **kwargs)
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index bd9ea6e..b3d5968 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -33,7 +33,7 @@ setup(name='arvados-cwl-runner',
# when updating the cwltool version pin.
install_requires=[
'cwltool==1.0.20160907141844',
- 'arvados-python-client>=0.1.20160714204738'
+ 'arvados-python-client>=0.1.20160826210445'
],
data_files=[
('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list