Merge pull request #2033 from BD2KGenomics/20180130_cwltool

latest CWL ref runner & conformance tests
DataBiosphere · Jan 30, 2018 · b800392 · b800392
2 parents b9b6ca1 + f67f4d5
commit b800392
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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")