Correctly propagate requirements/hints on Workflow step. (#192)

common-workflow-language · Sep 15, 2016 · 63f5e50 · 63f5e50
1 parent 876c0fc
commit 63f5e50
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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),