8653: Update load_tool in cwl-runner crunch script
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 May 2016 02:01:15 +0000 (22:01 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 May 2016 02:01:15 +0000 (22:01 -0400)
crunch_scripts/cwl-runner

index 5e7982cec5ec8c34f0c203e5e921e49c00e9845f..fabb6db058703450e0174018403d0131e1015f2f 100755 (executable)
@@ -20,6 +20,7 @@ import json
 import argparse
 from arvados.api import OrderedJsonModel
 from cwltool.process import adjustFiles
+from cwltool.load_tool import load_tool
 
 # Print package versions
 logging.info(cwltool.main.versionstring())
@@ -48,7 +49,7 @@ try:
 
     runner = arvados_cwl.ArvCwlRunner(api_client=arvados.api('v1', model=OrderedJsonModel()))
 
-    t = cwltool.main.load_tool(job_order_object, False, True, runner.arvMakeTool, True)
+    t = load_tool(job_order_object, runner.arvMakeTool)
 
     args = argparse.Namespace()
     args.project_uuid = arvados.current_job()["owner_uuid"]