From f33a57a7cd93fcbf7d91ad65494ccf5cea512361 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 1 Sep 2016 09:52:11 -0400 Subject: [PATCH] 9850: Update cwltool to get javascript evaluation performance improvements. --- build/run-build-packages.sh | 7 +++---- sdk/cwl/setup.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index ae2de696cf..fa5736be31 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -459,15 +459,14 @@ fpm_build $WORKSPACE/sdk/cwl "${PYTHON2_PKG_PREFIX}-arvados-cwl-runner" 'Curover # So we build this thing separately. # # Ward, 2016-03-17 -fpm_build schema_salad "" "" python 1.16.20160810195039 +fpm_build schema_salad "" "" python 1.17.20160820171034 # And schema_salad now depends on ruamel-yaml, which apparently has a braindead setup.py that requires special arguments to build (otherwise, it aborts with 'error: you have to install with "pip install ."'). Sigh. # Ward, 2016-05-26 -# ...and schema_salad 1.12.20160610104117 doesn't work with ruamel-yaml > 0.11.11. -fpm_build ruamel.yaml "" "" python 0.11.11 --python-setup-py-arguments "--single-version-externally-managed" +fpm_build ruamel.yaml "" "" python 0.12.4 --python-setup-py-arguments "--single-version-externally-managed" # And for cwltool we have the same problem as for schema_salad. Ward, 2016-03-17 -fpm_build cwltool "" "" python 1.0.20160811184335 +fpm_build cwltool "" "" python 1.0.20160901133827 # FPM eats the trailing .0 in the python-rdflib-jsonld package when built with 'rdflib-jsonld>=0.3.0'. Force the version. Ward, 2016-03-25 fpm_build rdflib-jsonld "" "" python 0.3.0 diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py index e22a74facc..86b24a394e 100644 --- a/sdk/cwl/setup.py +++ b/sdk/cwl/setup.py @@ -32,7 +32,7 @@ setup(name='arvados-cwl-runner', # Make sure to update arvados/build/run-build-packages.sh as well # when updating the cwltool version pin. install_requires=[ - 'cwltool==1.0.20160811184335', + 'cwltool==1.0.20160901133827', 'arvados-python-client>=0.1.20160714204738', ], data_files=[ -- 2.30.2