some typehints are now in external packages

Makefile

@@ -62,7 +62,7 @@ dev: install-dep
 dist: dist/${MODULE}-$(VERSION).tar.gz
 
 dist/${MODULE}-$(VERSION).tar.gz: $(SOURCES)
-	./setup.py sdist bdist_wheel
+	python setup.py sdist bdist_wheel
 
 ## docs	       : make the docs
 docs: FORCE
@@ -71,7 +71,7 @@ docs: FORCE
 ## clean       : clean up all temporary / machine-generated files
 clean: FORCE
 	rm -f ${MODILE}/*.pyc tests/*.pyc
-	./setup.py clean --all || true
+	python setup.py clean --all || true
 	rm -Rf .coverage
 	rm -f diff-cover.html
 
@@ -199,7 +199,7 @@ release-test: FORCE
 
 release: release-test
 	. testenv2/bin/activate && \
-		testenv2/src/${PACKAGE}/setup.py sdist bdist_wheel
+		python testenv2/src/${PACKAGE}/setup.py sdist bdist_wheel
 	. testenv2/bin/activate && \
 		pip install twine && \
 		twine upload testenv2/src/${PACKAGE}/dist/* && \

mypy.ini

@@ -4,7 +4,7 @@ show_column_numbers = true
 show_error_codes = true
 pretty = true
 
-# --strict options as of mypy 0.812
+# --strict options as of mypy 0.901
 warn_unused_configs = True
 disallow_any_generics = True
 disallow_subclassing_any = True

mypy_requirements.txt

@@ -1,2 +1,4 @@
 mypy==0.901
+types-pkg_resources
+types-requests
 pytest

schema_salad/ref_resolver.py

@@ -4,6 +4,7 @@
 import pathlib
 import re
 import tempfile
+import urllib
 import xml.sax  # nosec
 from io import StringIO
 from typing import (
@@ -28,7 +29,6 @@
 from rdflib.plugins.parsers.notation3 import BadSyntax
 from ruamel import yaml
 from ruamel.yaml.comments import CommentedMap, CommentedSeq, LineCol
-from six.moves import urllib
 
 from .exceptions import SchemaSaladException, ValidationException
 from .fetcher import DefaultFetcher

typeshed/rdflib/namespace.pyi

@@ -1,9 +1,8 @@
-from six import text_type
 from typing import Any, Optional
 from rdflib.term import URIRef
 from unicodedata import category
 
-class Namespace(text_type):
+class Namespace(str):
     __doc__: str = ...
     def __new__(cls, value: Any): ...
     @property
@@ -12,7 +11,7 @@ class Namespace(text_type):
     def __getitem__(self, key: Any, default: Optional[Any] = ...): ...
     def __getattr__(self, name: Any): ...
 
-class URIPattern(text_type):
+class URIPattern(str):
     __doc__: str = ...
     def __new__(cls, value: Any): ...
     def __mod__(self, *args: Any, **kwargs: Any): ...