From f67f4d5a3c0803a6c8c95e7ca6a5ad7b4c6e5735 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Tue, 30 Jan 2018 17:54:26 +0200 Subject: [PATCH] latest CWL ref runner & conformance tests --- setup.py | 4 ++-- src/toil/test/cwl/cwlTest.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index eccf509261..6dafa790d3 100644 --- a/setup.py +++ b/setup.py @@ -30,10 +30,10 @@ def runSetup(): azureCosmosdbTable = 'azure-cosmosdb-table==0.37.1' pynacl = 'pynacl==1.1.2' gcs_oauth2_boto_plugin = 'gcs_oauth2_boto_plugin==1.14' - cwltool = 'cwltool==1.0.20180108222053' + cwltool = 'cwltool==1.0.20180130110340' schemaSalad = 'schema-salad >= 2.6, < 3' galaxyLib = 'galaxy-lib==17.9.3' - cwltest = 'cwltest>=1.0.20170214185319' + cwltest = 'cwltest>=1.0.20180130081614' mesos_reqs = [ psutil] diff --git a/src/toil/test/cwl/cwlTest.py b/src/toil/test/cwl/cwlTest.py index 73d7e43495..03e4deb541 100644 --- a/src/toil/test/cwl/cwlTest.py +++ b/src/toil/test/cwl/cwlTest.py @@ -122,7 +122,7 @@ def path_without_rev(): def test_run_conformance(self): rootDir = self._projectRootPath() cwlSpec = os.path.join(rootDir, 'src/toil/test/cwl/spec') - testhash = "97173a98a46e23b59700daf01a84f8dd16cee4e4" + testhash = "91f108df4d4ca567e567fc65f61feb0674467a84" url = "https://github.com/common-workflow-language/common-workflow-language/archive/%s.zip" % testhash if not os.path.exists(cwlSpec): urlretrieve(url, "spec.zip")