Skip to content

Commit 81038c9

Browse files
author
Peter Amstutz
committed
Fix more tests
1 parent 663702e commit 81038c9

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

cwltool/job.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@ def _job_popen(
523523
if stderr_path is not None:
524524
stderr = open(stderr_path, "wb")
525525

526-
print("ZZZ", commands)
527526
sproc = subprocess.Popen(commands,
528527
shell=False,
529528
close_fds=not onWindows(),

cwltool/pack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ def rewrite_id(r, mainuri):
178178
if isinstance(dcr, CommentedSeq):
179179
dcr = dcr[0]
180180
dcr = cast(CommentedMap, dcr)
181-
if not isinstance(dcr, dict):
181+
if not isinstance(dcr, MutableMapping):
182182
continue
183183
for doc in (dcr, metadata):
184184
if "$schemas" in doc:

cwltool/workflow.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,13 @@ def __init__(self,
602602

603603
loadingContext = loadingContext.copy()
604604

605-
loadingContext.requirements = (getdefault(loadingContext.requirements, []) +
606-
toolpath_object.get("requirements", []) +
607-
get_overrides(getdefault(loadingContext.overrides_list, []),
605+
loadingContext.requirements = copy.deepcopy(getdefault(loadingContext.requirements, []))
606+
loadingContext.requirements.extend(toolpath_object.get("requirements", []))
607+
loadingContext.requirements.extend(get_overrides(getdefault(loadingContext.overrides_list, []),
608608
self.id).get("requirements", []))
609-
loadingContext.hints = getdefault(loadingContext.hints, []) + toolpath_object.get("hints", [])
609+
610+
loadingContext.hints = copy.deepcopy(getdefault(loadingContext.hints, []))
611+
loadingContext.hints.extend(toolpath_object.get("hints", []))
610612

611613
try:
612614
if isinstance(toolpath_object["run"], MutableMapping):

0 commit comments

Comments
 (0)