[ARVADOS] updated: 1.3.0-855-g725ff809b

Git user git at public.curoverse.com
Tue May 28 17:40:36 UTC 2019


Summary of changes:
 sdk/cwl/arvados_cwl/executor.py | 2 +-
 sdk/cwl/setup.py                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  725ff809bfef3214ca9117b768711c8136ed4cc3 (commit)
      from  14db4dcdc2b0b7e5fbc81d62cf581dea5ccc07f4 (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 725ff809bfef3214ca9117b768711c8136ed4cc3
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue May 28 13:40:14 2019 -0400

    15028: Bump schema salad version.  Use containers API preferentially.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index d2fd0088c..7886a6b35 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -152,7 +152,7 @@ class ArvCwlExecutor(object):
                                            num_retries=self.num_retries)
 
         self.work_api = None
-        expected_api = ["jobs", "containers"]
+        expected_api = ["containers", "jobs"]
         for api in expected_api:
             try:
                 methods = self.api._rootDesc.get('resources')[api]['methods']
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 31195fd37..4ad36cc5a 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -34,7 +34,7 @@ setup(name='arvados-cwl-runner',
       # file to determine what version of cwltool and schema-salad to build.
       install_requires=[
           'cwltool==1.0.20190525125941',
-          'schema-salad==4.1.20190305210046',
+          'schema-salad==4.2.20190417121603',
           'typing >= 3.6.4',
           'ruamel.yaml >=0.15.54, <=0.15.77',
           'arvados-python-client>=1.3.0.20190205182514',

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list