Skip to content

Commit 522a34b

Browse files
committed
rename our local type stubs directory
as per python/mypy#13155 (comment)
1 parent 46d03e1 commit 522a34b

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ venv3/
2828
# pycharm
2929
.idea/
3030

31-
# typshed repo
32-
typeshed/2and3/schema_salad
33-
typeshed/2and3/ruamel/yaml
34-
35-
3631
#mypy
3732
.mypy_cache/
3833
bin/

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ clean: FORCE
7272
# Linting and code style related targets
7373
## sorting imports using isort: https://github.com/timothycrosley/isort
7474
sort_imports: $(PYSOURCES)
75-
isort $^ typeshed
75+
isort $^ mypy-stubs
7676

7777
remove_unused_imports: $(PYSOURCES)
7878
autoflake --in-place --remove-all-unused-imports $^
@@ -93,7 +93,7 @@ format:
9393
black setup.py cwlupgrader tests
9494

9595
format-check:
96-
black --diff --check cwlupgrader setup.py typeshed
96+
black --diff --check cwlupgrader setup.py mypy-stubs
9797

9898
## pylint : run static code analysis on Python code
9999
pylint: $(PYSOURCES)
@@ -153,11 +153,11 @@ mypy3: mypy
153153
mypy: $(PYSOURCES)
154154
if ! test -f $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))')/py.typed ; \
155155
then \
156-
rm -Rf typeshed/ruamel/yaml ; \
156+
rm -Rf mypy-stubs/ruamel/yaml ; \
157157
ln -s $(shell python3 -c 'import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
158-
typeshed/ruamel/ ; \
158+
mypy-stubs/ruamel/ ; \
159159
fi # if minimally required ruamel.yaml version is 0.15.99 or greater, than the above can be removed
160-
MYPYPATH=$$MYPYPATH:typeshed mypy $^
160+
MYPYPATH=$$MYPYPATH:mypy-stubs mypy $^
161161

162162
pyupgrade: $(PYSOURCES)
163163
pyupgrade --exit-zero-even-if-changed --py36-plus $^

0 commit comments

Comments
 (0)