From 63f5e50dc58516e5be8ef207b8840d0fff522caa Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 15 Sep 2016 16:25:19 -0400 Subject: [PATCH] Correctly propagate requirements/hints on Workflow step. (#192) --- cwltool/workflow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cwltool/workflow.py b/cwltool/workflow.py index 2e1ee1193..c1dc41167 100644 --- a/cwltool/workflow.py +++ b/cwltool/workflow.py @@ -430,6 +430,9 @@ def __init__(self, toolpath_object, pos, **kwargs): else: self.id = "#step" + Text(pos) + kwargs["requirements"] = kwargs.get("requirements", []) + toolpath_object.get("requirements", []) + kwargs["hints"] = kwargs.get("hints", []) + toolpath_object.get("hints", []) + try: if isinstance(toolpath_object["run"], dict): self.embedded_tool = kwargs.get("makeTool")(toolpath_object["run"], **kwargs) @@ -529,9 +532,6 @@ def job(self, joborder, output_callback, **kwargs): joborder[field] = joborder[i["id"]] del joborder[i["id"]] - kwargs["requirements"] = kwargs.get("requirements", []) + self.tool.get("requirements", []) - kwargs["hints"] = kwargs.get("hints", []) + self.tool.get("hints", []) - try: for t in self.embedded_tool.job(joborder, functools.partial(self.receive_output, output_callback),