Merge pull request #318 from common-workflow-language/rdflib-fix

Bump schema salad pin.  Pin mypy version.

Author: mr-c

requirements.txt

@@ -3,5 +3,5 @@ ruamel.yaml==0.13.7
 rdflib==4.2.1
 rdflib-jsonld==0.4.0
 shellescape==3.4.1
-schema-salad>=2.1.20170208112505,<3
+schema-salad>=2.3.20170302225134,<3
 typing==3.5.2.2 ; python_version>="2.7"

setup.py

@@ -50,7 +50,7 @@
           'ruamel.yaml >= 0.12.4',
           'rdflib >= 4.2.2, < 4.3.0',
           'shellescape >= 3.4.1, < 3.5',
-          'schema-salad >= 2.2.20170222151604, < 3',
+          'schema-salad >= 2.3.20170302225134, < 3',
           'typing >= 3.5.2, < 3.6',
           'six >= 1.10.0',
 

tests/test_examples.py

@@ -6,6 +6,7 @@
 import cwltool.process
 import cwltool.workflow
 from .util import get_data
+from cwltool.main import main
 
 class TestParamMatching(unittest.TestCase):
     def test_params(self):
@@ -336,6 +337,11 @@ def test_lifting(self):
             echo = f.make(get_data("tests/test_bad_outputs_wf.cwl"))
             self.assertEqual(echo(inp="foo"), {"out": "foo\n"})
 
+class TestPrintDot(unittest.TestCase):
+    def test_print_dot(self):
+        # Require that --enable-ext is provided.
+        self.assertEquals(main(["--print-dot", get_data('tests/wf/revsort.cwl')]), 0)
+
 
 if __name__ == '__main__':
     unittest.main()

tox.ini

@@ -15,15 +15,15 @@ deps = -rrequirements.txt
 commands = make mypy
 whitelist_externals = make
 deps =
-  mypy>=0.470
+  mypy==0.470
   typed-ast==0.6.3
   -rrequirements.txt
 
 [testenv:py35-mypy]
 commands = make mypy3
 whitelist_externals = make
 deps =
-  mypy>=0.470
+  mypy==0.470
   typed-ast==0.6.3
   -rrequirements.txt