[ARVADOS] created: 1.3.0-2773-g35ad6190c
Git user
git at public.arvados.org
Mon Jul 13 21:40:12 UTC 2020
at 35ad6190cd68cbc544325b4fe6422b8142152aae (commit)
commit 35ad6190cd68cbc544325b4fe6422b8142152aae
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Mon Jul 13 17:39:50 2020 -0400
16584: Add --skip-schemas (passthrough to cwltool)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index adbce90d8..8880f94c4 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -202,6 +202,14 @@ def arg_parser(): # type: () -> argparse.ArgumentParser
parser.add_argument("--http-timeout", type=int,
default=5*60, dest="http_timeout", help="API request timeout in seconds. Default is 300 seconds (5 minutes).")
+ parser.add_argument(
+ "--skip-schemas",
+ action="store_true",
+ help="Skip loading of schemas",
+ default=False,
+ dest="skip_schemas",
+ )
+
exgroup = parser.add_mutually_exclusive_group()
exgroup.add_argument("--trash-intermediate", action="store_true",
default=False, dest="trash_intermediate",
commit a220e4f0cc249bbab55399ecebd65e1294fa8c7c
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Mon Jul 13 17:36:45 2020 -0400
16584: collection name quote slashes in http_to_keep
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/cwl/arvados_cwl/http.py b/sdk/cwl/arvados_cwl/http.py
index 47a304372..dcc2a5119 100644
--- a/sdk/cwl/arvados_cwl/http.py
+++ b/sdk/cwl/arvados_cwl/http.py
@@ -16,6 +16,7 @@ import arvados.collection
import urllib.parse
import logging
import calendar
+import urllib.parse
logger = logging.getLogger('arvados.cwl-runner')
@@ -148,7 +149,9 @@ def http_to_keep(api, project_uuid, url, utcnow=datetime.datetime.utcnow):
logger.info("%d downloaded, %3.2f MiB/s", count, (bps / (1024*1024)))
checkpoint = loopnow
- c.save_new(name="Downloaded from %s" % url, owner_uuid=project_uuid, ensure_unique_name=True)
+
+ collectionname = "Downloaded from %s" % urllib.parse.quote(url, safe='')
+ c.save_new(name=collectionname, owner_uuid=project_uuid, ensure_unique_name=True)
api.collections().update(uuid=c.manifest_locator(), body={"collection":{"properties": properties}}).execute()
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list