From 725ff809bfef3214ca9117b768711c8136ed4cc3 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 28 May 2019 13:40:14 -0400 Subject: [PATCH] 15028: Bump schema salad version. Use containers API preferentially. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/arvados_cwl/executor.py | 2 +- sdk/cwl/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py index d2fd0088ca..7886a6b350 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 31195fd372..4ad36cc5a1 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', -- 2.30.2