15028: Bump schema salad version. Use containers API preferentially.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index d2fd0088cadc0bba00009a76b98136908c3158b1..7886a6b3502e38c24b36c10374afb8cb3d9efc22 100644 (file)
--- 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 31195fd372874bcfc2dce1b1846d8e5cec552362..4ad36cc5a1b582b2587d3204f32324253185bda0 100644 (file)
--- 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',