[ARVADOS] updated: cd206dc9f38a5d6c1cd115b53cb77be071edd57c

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

       via  cd206dc9f38a5d6c1cd115b53cb77be071edd57c (commit)
      from  fbc5ee7656bb337f15b3b2b7c88473f29f40c8b0 (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 cd206dc9f38a5d6c1cd115b53cb77be071edd57c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jun 21 12:16:23 2016 -0400

    8442: Make work_api parameter to ArvCwlRunner constructor optional.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 69c933c..9b30611 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -34,7 +34,7 @@ class ArvCwlRunner(object):
 
     """
 
-    def __init__(self, api_client, work_api):
+    def __init__(self, api_client, work_api=None):
         self.api = api_client
         self.processes = {}
         self.lock = threading.Lock()
@@ -46,6 +46,10 @@ class ArvCwlRunner(object):
         self.uuid = None
         self.work_api = work_api
 
+        if self.work_api is None:
+            # todo: autodetect API to use.
+            self.work_api = "jobs"
+
         if self.work_api not in ("containers", "jobs"):
             raise Exception("Unsupported API '%s'" % self.work_api)
 
@@ -290,9 +294,6 @@ def main(args, stdout, stderr, api_client=None):
     if arvargs.create_template and not arvargs.job_order:
         job_order_object = ({}, "")
 
-    if arvargs.work_api is None:
-        arvargs.work_api = "jobs"
-
     try:
         if api_client is None:
             api_client=arvados.api('v1', model=OrderedJsonModel())

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


hooks/post-receive
--