Merge pull request #990 from common-workflow-language/schema_salad_v3

Schema salad v3

Author: mr-c

README.rst

@@ -21,7 +21,8 @@ This is the reference implementation of the Common Workflow Language.  It is
 intended to be feature complete and provide comprehensive validation of CWL
 files as well as provide other tools related to working with CWL.
 
-This is written and tested for `Python <https://www.python.org/>`_ ``2.7 and 3.x {x = 4, 5, 6}``
+This is written and tested for
+`Python <https://www.python.org/>`_ ``2.7 and 3.x {x = 4, 5, 6, 7}``
 
 The reference implementation consists of two packages.  The ``cwltool`` package
 is the primary Python module containing the reference implementation in the

requirements.txt

@@ -2,7 +2,7 @@ requests>=2.4.3
 ruamel.yaml>=0.12.4,<=0.15.77
 rdflib>=4.2.2,<4.3
 shellescape>=3.4.1,<3.5
-schema-salad>=2.8,<3
+schema-salad>=3.0,<3.1
 typing>=3.5.3; python_version<"3.6"
 pathlib2==2.3.2; python_version<"3"
 prov==1.5.1

setup.py

@@ -53,7 +53,7 @@
           'ruamel.yaml >= 0.12.4, <= 0.15.77',
           'rdflib >= 4.2.2, < 4.3.0',
           'shellescape >= 3.4.1, < 3.5',
-          'schema-salad >= 2.8, < 3',
+          'schema-salad >= 3.0, < 3.1',
           'mypy-extensions',
           'six >= 1.9.0',  # >= 1.9.0 required by prov
           'psutil',