Merge branch 'master' into debug-fixes

Author: mr-c

Makefile

@@ -187,6 +187,6 @@ jenkins:
 	. env3/bin/activate ; \
 	pip install -U setuptools pip wheel ; \
 	${MAKE} install-dep ; \
-	pip install -U mypy-lang typed-ast ; ${MAKE} mypy
+	pip install -U mypy ; ${MAKE} mypy
 
 FORCE:

tox.ini

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