Skip to content

mypy_test.py: Allow non-types dependencies #9408

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
AlexWaygood merged 19 commits into from
Jan 7, 2023
Merged

mypy_test.py: Allow non-types dependencies #9408

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
56e755b
Refactor to use subprocess; other small improvements
AlexWaygood Dec 25, 2022
ee036e7
Allow non-types dependencies
AlexWaygood Dec 25, 2022
ca484c4
Share venvs between packages with common requirements
AlexWaygood Dec 26, 2022
db260f2
Here's what happens if we add loads of non-types requirements
AlexWaygood Dec 26, 2022
28973be
Revert "Here's what happens if we add loads of non-types requirements"
AlexWaygood Dec 26, 2022
1c80dc1
Some small improvements
AlexWaygood Dec 26, 2022
e935526
Revert `packaging` bump
AlexWaygood Dec 26, 2022
dd7a229
Move requirement-normalization logic to `utils.py`
AlexWaygood Dec 27, 2022
c5c93c9
A better if-condition in `make_venv`
AlexWaygood Dec 27, 2022
fec7b0b
Improve grammar in logged message, why not
AlexWaygood Dec 27, 2022
fc085e1
Remove redundant error code
AlexWaygood Dec 31, 2022
a590265
Add issue number to comment, for easy greppability
AlexWaygood Jan 1, 2023
bd92207
Merge branch 'main' into mypy-test-non-types
AlexWaygood Jan 3, 2023
53c3b22
Run `pip freeze` if `--verbose` is specified, there are non-types dep…
AlexWaygood Jan 3, 2023
d5f05b8
Fix
AlexWaygood Jan 3, 2023
abbd4eb
Simplify
AlexWaygood Jan 4, 2023
a363399
Merge branch 'main' into mypy-test-non-types
AlexWaygood Jan 4, 2023
82c085c
Exit early from function if no stubs have external requirements
AlexWaygood Jan 5, 2023
49b062c
Fix crash when a stubs package specifies a dependency on a non-types …
AlexWaygood Jan 5, 2023
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
Prev Previous commit
Next Next commit
Move requirement-normalization logic to utils.py
  • Loading branch information
@AlexWaygood
AlexWaygood committed Dec 27, 2022
commit dd7a229b0d9d29578ad54a28c60542f4897e8430
6 changes: 1 addition & 5 deletions tests/mypy_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from typing_extensions import Annotated, TypeAlias

import tomli
from packaging.requirements import Requirement
from utils import (
VERSIONS_RE as VERSION_LINE_RE,
PackageDependencies,
Expand Down Expand Up @@ -397,10 +396,7 @@ def setup_virtual_environments(distributions: dict[str, PackageDependencies], ar
for distribution_name, requirements in distributions.items():
if requirements.external_pkgs:
num_pkgs_with_external_reqs += 1
# convert to Requirement and then back to str
# to make sure that the requirements all have a normalised string representation
# (This will also catch any malformed requirements early)
external_requirements = frozenset(str(Requirement(pkg)) for pkg in requirements.external_pkgs)
external_requirements = frozenset(requirements.external_pkgs)
external_requirements_to_distributions[external_requirements].append(distribution_name)
else:
_DISTRIBUTION_TO_VENV_MAPPING[distribution_name] = no_external_dependencies_venv
Expand Down
5 changes: 4 additions & 1 deletion tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ def read_dependencies(distribution: str) -> PackageDependencies:
if maybe_typeshed_dependency in pypi_name_to_typeshed_name_mapping:
typeshed.append(pypi_name_to_typeshed_name_mapping[maybe_typeshed_dependency])
else:
external.append(dependency)
# convert to Requirement and then back to str
# to make sure that the requirements all have a normalised string representation
# (This will also catch any malformed requirements early)
external.append(str(Requirement(dependency)))
return PackageDependencies(tuple(typeshed), tuple(external))


Expand Down