Skip to content

Commit 98b2f4c

Browse files
authored
Merge pull request #664 from philres/master
Fix eval_timeout in workflow
2 parents 8f39f9c + ce00d73 commit 98b2f4c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

cwltool/workflow.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ def try_make_job(self, step, final_output_callback, **kwargs):
344344

345345
js_console = kwargs.get("js_console", False)
346346
debug = kwargs.get("debug", False)
347+
timeout = kwargs.get("eval_timeout")
347348

348349
inputparms = step.tool["inputs"]
349350
outputparms = step.tool["outputs"]
@@ -383,7 +384,7 @@ def valueFromFunc(k, v): # type: (Any, Any) -> Any
383384
if k in valueFrom:
384385
return expression.do_eval(
385386
valueFrom[k], shortio, self.workflow.requirements,
386-
None, None, {}, context=v, debug=debug, js_console=js_console)
387+
None, None, {}, context=v, debug=debug, js_console=js_console, timeout=timeout)
387388
else:
388389
return v
389390

0 commit comments

Comments
 (0)