[ARVADOS] updated: 126a8a239853e46cef3d4b7e5acf7620c0bd1f36
Git user
git at public.curoverse.com
Tue Mar 28 16:01:59 EDT 2017
Summary of changes:
sdk/cwl/arvados_cwl/__init__.py | 2 ++
sdk/cwl/arvados_cwl/fsaccess.py | 2 ++
sdk/cwl/arvados_cwl/runner.py | 3 ---
sdk/cwl/setup.py | 5 +++--
4 files changed, 7 insertions(+), 5 deletions(-)
via 126a8a239853e46cef3d4b7e5acf7620c0bd1f36 (commit)
via 11e4219911b6a3ff8696c7a0401ce4dcaac64d5f (commit)
via 71f0b2ccf5f82c5ff86e51c06060ef4a9234e6d3 (commit)
via fdc7164e11eb019122b6deb9054decb9fe0be0ce (commit)
via a774873482ade7b9dd0f9a607c97b848b77fb6f2 (commit)
from 922e79bea1cb6d4df7cf1db48c4b73ebac03b64e (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 126a8a239853e46cef3d4b7e5acf7620c0bd1f36
Merge: fdc7164 11e4219
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Mar 28 16:01:50 2017 -0400
Merge branch '11333-cwl-phone-home' closes #11333
commit 11e4219911b6a3ff8696c7a0401ce4dcaac64d5f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Mar 28 12:57:25 2017 -0400
11333: Add explicit version pin on 'typing'
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index ed384d2..46f61ae 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -50,6 +50,7 @@ setup(name='arvados-cwl-runner',
install_requires=[
'cwltool==1.0.20170224141733',
'schema-salad==2.2.20170222151604',
+ 'typing==3.5.3',
'ruamel.yaml==0.13.7',
'arvados-python-client>=0.1.20170112173420',
'setuptools'
commit 71f0b2ccf5f82c5ff86e51c06060ef4a9234e6d3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Mar 28 12:44:20 2017 -0400
11332: Suppress phone-home behavior in check_exists by recognizing
http://arvados.org/cwl and returning True.
diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py
index 2191dcb..70aa69f 100644
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -152,6 +152,8 @@ class CollectionFetcher(DefaultFetcher):
def check_exists(self, url):
try:
+ if url.startswith("http://arvados.org/cwl"):
+ return True
if url.startswith("keep:"):
return self.fsaccess.exists(url)
if url.startswith("arvwf:"):
commit fdc7164e11eb019122b6deb9054decb9fe0be0ce
Merge: 922e79b a774873
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Mar 28 15:50:02 2017 -0400
Merge branch '11332-cwl-filenames' closes #11332
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list