[ARVADOS] created: 2.1.0-1907-g0494b40a0
Git user
git at public.arvados.org
Thu Feb 10 21:01:27 UTC 2022
at 0494b40a03348e584dbc255d93615a4ef01afaf9 (commit)
commit 0494b40a03348e584dbc255d93615a4ef01afaf9
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Thu Feb 10 16:00:16 2022 -0500
18723: Update cwltool version for scandirs fix
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 145f1ad7f..7d6d287a2 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -283,9 +283,10 @@ def upload_dependencies(arvrunner, name, document_loader,
metadata = scanobj
sc_result = scandeps(uri, scanobj,
- loadref_fields,
- set(("$include", "$schemas", "location")),
- loadref, urljoin=document_loader.fetcher.urljoin)
+ loadref_fields,
+ set(("$include", "$schemas", "location")),
+ loadref, urljoin=document_loader.fetcher.urljoin,
+ nestdirs=False)
sc = []
uuids = {}
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index f034ca5ab..ae90df43c 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -39,7 +39,7 @@ setup(name='arvados-cwl-runner',
# file to determine what version of cwltool and schema-salad to
# build.
install_requires=[
- 'cwltool==3.1.20211107152837',
+ 'cwltool==3.1.20220210171524',
'schema-salad==8.2.20211116214159',
'arvados-python-client{}'.format(pysdk_dep),
'setuptools',
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list