8000 Further improve `mypy_test.py` by AlexWaygood · Pull Request #7484 · python/typeshed · GitHub
[go: up one dir, main page]
Skip to content

Further improve mypy_test.py #7484

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

Merged
merged 2 commits into from
Mar 13, 2022
Merged

Further improve mypy_test.py #7484

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91e5dd2
Further improve `mypy_test.py`
AlexWaygood Mar 13, 2022
83b05f3
Address review
AlexWaygood Mar 13, 2022
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 .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
strategy:
matrix:
platform: ["linux", "win32", "darwin"]
python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10"]
python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
fail-fast: false
steps:
- uses: actions/checkout@v2
Expand Down
26 changes: 16 additions & 10 deletions tests/mypy_test.py
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

1. Parse sys.argv
2. Compute appropriate arguments for mypy
3. Stuff those arguments into sys.argv
4. Run mypy.main('')
5. Repeat steps 2-4 for other mypy runs (e.g. --py2)
3. Pass those arguments to mypy.api.run()
"""

import argparse
Expand Down Expand Up @@ -95,15 +93,13 @@ def parse_version(v_str):
return int(m.group(1)), int(m.group(2))


def is_supported(distribution, major):
dist_path = Path("stubs", distribution)
with open(dist_path / "METADATA.toml") as f:
data = dict(tomli.loads(f.read()))
def is_supported(distribution_path: Path, major: int) -> bool:
data = dict(tomli.loads((distribution_path / "METADATA.toml").read_text()))
if major == 2:
# Python 2 is not supported by default.
return bool(data.get("python2", False))
# Python 3 is supported by default.
return has_py3_stubs(dist_path)
return has_py3_stubs(distribution_path)


# Keep this in sync with stubtest_third_party.py
Expand Down Expand Up @@ -278,10 +274,15 @@ def test_third_party_distribution(distribution: str, major: int, minor: int, arg
return code, len(files)


def is_probably_stubs_folder(dist_path: Path) -> bool:
"""Validate that `dist_path` is a folder containing stubs"""
return (dist_path / "METADATA.toml").exists()


def main():
args = parser.parse_args()

versions = [(3, 10), (3, 9), (3, 8), (3, 7), (3, 6), (2, 7)]
versions = [(3, 11), (3, 10), (3, 9), (3, 8), (3, 7), (3, 6), (2, 7)]
if args.python_version:
versions = [v for v in versions if any(("%d.%d" % v).startswith(av) for av in args.python_version)]
if not versions:
Expand Down Expand Up @@ -327,7 +328,12 @@ def main():
if distribution == "SQLAlchemy":
continue # Crashes

if not is_supported(distribution, major):
distribution_path = Path("stubs", distribution)

if not is_probably_stubs_folder(distribution_path):
Copy link
Member

Choose a reason for hiding this comment

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

How will we catch it if somebody forgets to put a METADATA.toml in a new stubs folder?

Copy link
Member Author

Choose a reason for hiding this comment

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

Any better after 83b05f3?

continue

if not is_supported(distribution_path, major):
continue

this_code, checked = test_third_party_distribution(distribution, major, minor, args)
Expand Down
0