Merge pull request #54 from common-workflow-language/newer-ruamel

switch to latest ruamel.yaml with native types

Author: mr-c

Makefile

@@ -170,6 +170,9 @@ list-author-emails:
 	@git log --format='%aN,%aE' | sort -u | grep -v 'root'
 
 mypy: ${PYSOURCES}
+	rm -Rf typeshed/2.7/ruamel/yaml
+	ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
+		typeshed/2.7/ruamel/
 	MYPYPATH=typeshed/2.7 mypy --py2 --disallow-untyped-calls \
 		 --fast-parser --warn-redundant-casts --warn-unused-ignores \
 		 schema_salad

requirements.txt

@@ -1,5 +1,5 @@
 requests
-ruamel.yaml==0.11.11
+ruamel.yaml==0.12.4
 rdflib>=4.1.
 rdflib-jsonld>=0.3.0
 mistune

schema_salad/ref_resolver.py

@@ -650,7 +650,7 @@ def fetch(self, url, inject_ids=True):  # type: (unicode, bool) -> Any
                 textIO = StringIO(text)
             textIO.name = url  # type: ignore
             result = yaml.load(textIO, Loader=SafeLoader)
-        except yaml.parser.ParserError as e:  # type: ignore
+        except yaml.parser.ParserError as e:
             raise validate.ValidationException("Syntax error %s" % (e))
         if isinstance(result, dict) and inject_ids and self.identifiers:
             for identifier in self.identifiers:

setup.py

@@ -29,7 +29,7 @@
 
 install_requires = [
     'requests',
-    'ruamel.yaml == 0.11.11',
+    'ruamel.yaml == 0.12.4',
     'rdflib >= 4.1.0',
     'rdflib-jsonld >= 0.3.0',
     'mistune',

tox.ini

@@ -16,6 +16,7 @@ whitelist_externals = make
 deps =
   mypy-lang>=0.4
   typed-ast
+  -rrequirements.txt
 
 [testenv:py35-lint]
 commands = flake8 schema_salad setup.py