From 607b3ff04d3632420aff1899d57a37c3d7acefdc Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Tue, 15 Oct 2019 11:13:02 +0200 Subject: [PATCH 1/3] overwrite manually set ids --- cwltool/load_tool.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cwltool/load_tool.py b/cwltool/load_tool.py index c651c0415..2d97b7693 100644 --- a/cwltool/load_tool.py +++ b/cwltool/load_tool.py @@ -112,6 +112,8 @@ def fetch_document(argsworkflow, # type: Union[Text, Dict[Text, Any]] resolver=loadingContext.resolver, document_loader=loadingContext.loader) workflowobj = loadingContext.loader.fetch(fileuri) + if 'name' in workflowobj: + workflowobj['id'] = workflowobj['name'] return loadingContext, workflowobj, uri if isinstance(argsworkflow, dict): uri = argsworkflow["id"] if argsworkflow.get("id") else "_:" + Text(uuid.uuid4()) From 30a3072df7bf9b4ec8b378fcc163871255114d71 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Fri, 3 Sep 2021 12:23:41 +0200 Subject: [PATCH 2/3] fix formatting --- cwltool/load_tool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cwltool/load_tool.py b/cwltool/load_tool.py index f844ad89b..8c8249039 100644 --- a/cwltool/load_tool.py +++ b/cwltool/load_tool.py @@ -131,8 +131,8 @@ def fetch_document( CommentedMap, loadingContext.loader.fetch(fileuri, content_types=CWL_CONTENT_TYPES), ) - if 'name' in workflowobj: - workflowobj['id'] = workflowobj['name'] + if "name" in workflowobj: + workflowobj["id"] = workflowobj["name"] return loadingContext, workflowobj, uri if isinstance(argsworkflow, MutableMapping): uri = ( From 514b64a06abe535827c4db2bb80b6850d2350ed5 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Fri, 3 Sep 2021 15:28:06 +0200 Subject: [PATCH 3/3] try something simpler --- cwltool/load_tool.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cwltool/load_tool.py b/cwltool/load_tool.py index 8c8249039..90517b179 100644 --- a/cwltool/load_tool.py +++ b/cwltool/load_tool.py @@ -129,10 +129,10 @@ def fetch_document( ) workflowobj = cast( CommentedMap, - loadingContext.loader.fetch(fileuri, content_types=CWL_CONTENT_TYPES), + loadingContext.loader.fetch( + fileuri, content_types=CWL_CONTENT_TYPES, override_ids=True + ), ) - if "name" in workflowobj: - workflowobj["id"] = workflowobj["name"] return loadingContext, workflowobj, uri if isinstance(argsworkflow, MutableMapping): uri = (