rename our local type stubs dir

As per python/mypy#13155 (comment)

Author: mr-c

.gitignore

@@ -28,10 +28,8 @@ venv3/
 # pycharm
 .idea/
 
-# typshed repo
-typeshed/2and3/schema_salad
-typeshed/2and3/ruamel/yaml
-
+# local stubs
+mypy-stubs/ruamel/yaml
 
 #mypy
 .mypy_cache/

MANIFEST.in

@@ -3,7 +3,7 @@ include MANIFEST.in
 include LICENSE.txt
 include *requirements.txt mypy.ini tox.ini
 include gittaggers.py Makefile cwltool.py
-recursive-include typeshed *.pyi
+recursive-include mypy-stubs *.pyi
 include tests/*
 include tests/tmp1/tmp2/tmp3/.gitkeep
 include tests/tmp4/alpha/*

Makefile

@@ -110,7 +110,7 @@ diff_pydocstyle_report: pydocstyle_report.txt
 
 ## codespell   : check for common mispellings
 codespell:
-	codespell -w $(shell git ls-files | grep -v cwltool/schemas | grep -v cwltool/jshint/ | grep -v typeshed)
+	codespell -w $(shell git ls-files | grep -v cwltool/schemas | grep -v cwltool/jshint/ | grep -v mypy-stubs)
 
 ## format      : check/fix all code indentation and formatting (runs black)
 format:
@@ -177,14 +177,14 @@ mypy3: mypy
 mypy: $(filter-out setup.py gittagger.py,$(PYSOURCES))
 	if ! test -f $(shell python -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))')/py.typed ; \
 	then \
-		rm -Rf typeshed/ruamel/yaml ; \
+		rm -Rf mypy-stubs/ruamel/yaml ; \
 		ln -s $(shell python -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
-			typeshed/ruamel/ ; \
+			mypy-stubs/ruamel/ ; \
 	fi  # if minimally required ruamel.yaml version is 0.15.99 or greater, than the above can be removed
-	MYPYPATH=$$MYPYPATH:typeshed mypy $^
+	MYPYPATH=$$MYPYPATH:mypy-stubs mypy $^
 
 mypyc: $(PYSOURCES)
-	MYPYPATH=typeshed CWLTOOL_USE_MYPYC=1 pip install --verbose -e . \
+	MYPYPATH=mypy-stubs CWLTOOL_USE_MYPYC=1 pip install --verbose -e . \
 		 && pytest -rs -vv ${PYTEST_EXTRA}
 
 shellcheck: FORCE

cwltool.Dockerfile

@@ -9,10 +9,10 @@ RUN pip install toml -rmypy-requirements.txt "$(grep ruamel requirements.txt)" \
 	"$(grep schema.salad requirements.txt)"
 # schema-salad is needed to be installed (this time as pure Python) for
 # cwltool + mypyc
-RUN CWLTOOL_USE_MYPYC=1 MYPYPATH=typeshed pip wheel --no-binary schema-salad --wheel-dir=/wheels .[deps]
+RUN CWLTOOL_USE_MYPYC=1 MYPYPATH=mypy-stubs pip wheel --no-binary schema-salad --wheel-dir=/wheels .[deps]
 RUN rm /wheels/schema_salad*
 RUN pip install black
-RUN SCHEMA_SALAD_USE_MYPYC=1 MYPYPATH=typeshed pip wheel --no-binary schema-salad \
+RUN SCHEMA_SALAD_USE_MYPYC=1 MYPYPATH=mypy-stubs pip wheel --no-binary schema-salad \
 	$(grep schema.salad requirements.txt) black --wheel-dir=/wheels
 RUN pip install --force-reinstall --no-index --no-warn-script-location --root=/pythonroot/ /wheels/*.whl
 # --force-reinstall to install our new mypyc compiled schema-salad package