Skip to content

fix typing-extensions stubs shadowing typing_extensions #5109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix typing-extensions stubs shadowing typing_extensions #5109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9790db7
fix typing-extensions stubs shadowing typing_extensions
chdsbd Mar 12, 2021
9f03606
fix CI
chdsbd Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stubs/Deprecated/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/Jinja2/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-MarkupSafe", "types-typing-extensions"]
requires = ["types-MarkupSafe", "typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/Markdown/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/Werkzeug/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/aiofiles/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "0.1"
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/chardet/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/click-spinner/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/nmap/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/pathlib2/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "0.1"
python2 = true
python3 = false
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/protobuf/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-futures", "types-typing-extensions"]
requires = ["types-futures", "typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/python-dateutil/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/redis/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = "0.1"
python2 = true
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
2 changes: 1 addition & 1 deletion stubs/waitress/METADATA.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = "0.1"
requires = ["types-typing-extensions"]
requires = ["typing-extensions"]
8 changes: 8 additions & 0 deletions tests/check_consistent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
{"stdlib/threading.pyi", "stdlib/_dummy_threading.pyi"},
]

ALLOWED_PACKAGES = {
# mypy does not support stubs for typing-extensions, so we depend on
# `typing-extensions` instead of `types-typing-extensions`.
"typing-extensions"
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we may want to disallow types-typing-extensions.



def assert_stubs_only(directory):
"""Check that given directory contains only valid stub files."""
Expand Down Expand Up @@ -167,6 +173,8 @@ def check_metadata():
assert isinstance(data.get("python3", True), bool), f"Invalid python3 value for {distribution}"
assert isinstance(data.get("requires", []), list), f"Invalid requires value for {distribution}"
for dep in data.get("requires", []):
if dep in ALLOWED_PACKAGES:
continue
Comment on lines +176 to +177
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure how to handle this lint.

assert isinstance(dep, str), f"Invalid dependency {dep} for {distribution}"
assert dep.startswith("types-"), f"Only stub dependencies supported, got {dep}"
dep = dep[len("types-"):]
Expand Down