Don't switch to mypy v0.501 yet

But keep the improvements

Author: mr-c

Makefile

@@ -173,7 +173,9 @@ 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 --strict schema_salad/*.py
+	MYPYPATH=typeshed/2.7 mypy --py2 --disallow-untyped-calls \
+		 --fast-parser --warn-redundant-casts --warn-unused-ignores \
+		 schema_salad
 
 jenkins:
 	rm -Rf env && virtualenv env

schema_salad/ref_resolver.py

@@ -67,16 +67,16 @@ def __init__(self, normalize=unicode):  # type: (Callable) -> None
         self.normalize = normalize
 
     def __getitem__(self, key):  # type: (Any) -> Any
-        return super(NormDict, self).__getitem__(self.normalize(key))
+        return super(NormDict, self).__getitem__(self.normalize(key))  # type:  ignore
 
     def __setitem__(self, key, value):  # type: (Any, Any) -> Any
         return super(NormDict, self).__setitem__(self.normalize(key), value)
 
     def __delitem__(self, key):  # type: (Any) -> Any
-        return super(NormDict, self).__delitem__(self.normalize(key))
+        return super(NormDict, self).__delitem__(self.normalize(key))  # type: ignore
 
     def __contains__(self, key):  # type: (Any) -> Any
-        return super(NormDict, self).__contains__(self.normalize(key))
+        return super(NormDict, self).__contains__(self.normalize(key))  # type: ignore
 
 
 def merge_properties(a, b):  # type: (List[Any], List[Any]) -> Dict[Any, Any]
@@ -465,8 +465,7 @@ def resolve_ref(self,
         url = self.expand_url(lref, base_url, scoped_id=(obj is not None))
         # Has this reference been loaded already?
         if url in self.idx and (not mixin):
-            return cast(Union[CommentedMap, CommentedSeq, unicode],
-                self.idx[url]), {}
+            return self.idx[url], {}
 
         sl.raise_type = RuntimeError
         with sl:

tox.ini

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