[ARVADOS] updated: 69972d44f4806ea5ff89b9ba1afd6f51848968c9

Git user git at public.curoverse.com
Mon Sep 26 17:17:56 EDT 2016


Summary of changes:
 crunch_scripts/cwl-runner | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  69972d44f4806ea5ff89b9ba1afd6f51848968c9 (commit)
       via  91528dbaf47e8b89670b733f6cb5ce3709722b60 (commit)
      from  e0f4124bd0156f7cb029e5330e256086962f9e8e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 69972d44f4806ea5ff89b9ba1afd6f51848968c9
Merge: e0f4124 91528db
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Sep 26 17:17:35 2016 -0400

    Merge branch '10081-update-cwl-runner'  refs #10081


commit 91528dbaf47e8b89670b733f6cb5ce3709722b60
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Sep 26 17:04:29 2016 -0400

    10081: Fix renamed methods.

diff --git a/crunch_scripts/cwl-runner b/crunch_scripts/cwl-runner
index fe4e800..eec5aad 100755
--- a/crunch_scripts/cwl-runner
+++ b/crunch_scripts/cwl-runner
@@ -56,7 +56,7 @@ try:
 
     runner = arvados_cwl.ArvCwlRunner(api_client=arvados.api('v1', model=OrderedJsonModel()))
 
-    t = load_tool(job_order_object, runner.arvMakeTool)
+    t = load_tool(job_order_object, runner.arv_make_tool)
 
     args = argparse.Namespace()
     args.project_uuid = arvados.current_job()["owner_uuid"]
@@ -67,7 +67,7 @@ try:
     args.ignore_docker_for_reuse = False
     args.basedir = os.getcwd()
     args.cwl_runner_job={"uuid": arvados.current_job()["uuid"], "state": arvados.current_job()["state"]}
-    outputObj = runner.arvExecutor(t, job_order_object, **vars(args))
+    outputObj = runner.arv_executor(t, job_order_object, **vars(args))
 
     files = {}
     def capture(fileobj):

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list