Merge remote-tracking branch 'origin/master' into check-file-support-http

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
@@ -182,6 +185,8 @@ jenkins:
 		sloccount.sc pep8_report.txt pylint_report.txt
 	if ! test -d env3 ; then virtualenv -p python3 env3 ; fi
 	. env3/bin/activate ; \
-	pip install -U mypy-lang typed-ast; ${MAKE} mypy
+	pip install -U setuptools pip wheel ; \
+	${MAKE} install-dep ; \
+	pip install -U mypy-lang typed-ast ; ${MAKE} mypy
 
 FORCE:

requirements.txt

@@ -1,9 +1,10 @@
 requests
-ruamel.yaml==0.11.11
+ruamel.yaml==0.12.4
 rdflib>=4.1.
 rdflib-jsonld>=0.3.0
 mistune
-typing ; python_version>="2.7"
+typing>=3.5.2 ; python_version>="2.7"
 avro ; python_version<"3"
 avro-python3 ; python_version>="3"
-
+CacheControl
+lockfile

schema_salad/makedoc.py

@@ -5,7 +5,7 @@
 import copy
 import re
 import sys
-import StringIO
+from StringIO import StringIO
 import logging
 import urlparse
 from .aslist import aslist
@@ -153,7 +153,7 @@ class RenderType(object):
 
     def __init__(self, toc, j, renderlist, redirects):
         # type: (ToC, List[Dict], str, Dict) -> None
-        self.typedoc = StringIO.StringIO()
+        self.typedoc = StringIO()
         self.toc = toc
         self.subs = {}  # type: Dict[str, str]
         self.docParent = {}  # type: Dict[str, List]

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,11 +29,11 @@
 
 install_requires = [
     'requests',
-    'ruamel.yaml == 0.11.11',
+    'ruamel.yaml == 0.12.4',
     'rdflib >= 4.1.0',
     'rdflib-jsonld >= 0.3.0',
     'mistune',
-    'typing',
+    'typing >= 3.5.2',
     'CacheControl',
     'lockfile']
 
@@ -46,7 +46,7 @@
 extras_require = {}               # TODO: to be removed when the above is added
 
 setup(name='schema-salad',
-      version='1.16',
+      version='1.17',
       description='Schema Annotations for Linked Avro Data (SALAD)',
       long_description=open(README).read(),
       author='Common workflow language working group',

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