Skip to content

Commit 1b560bb

Browse files
authored
Bump setuptools to 71.0.* (#12381)
1 parent aae471f commit 1b560bb

File tree

6 files changed

+13
-60
lines changed

6 files changed

+13
-60
lines changed

stubs/setuptools/@tests/stubtest_allowlist.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,8 @@ setuptools._distutils.zosccompiler
123123
# Reexported from setuptools._distutils; problems should be fixed there
124124
distutils\..+
125125

126-
# Private APIs
127-
setuptools\.config\._validate_pyproject.*
126+
# Private APIs, tests and other vendored code
127+
setuptools.config._validate_pyproject.*
128128
setuptools.command.build_py.build_py.existing_egg_info_dir
129-
130-
# Other vendored code
131-
pkg_resources\._vendor.*
132-
setuptools\._distutils\._vendor.*
133-
setuptools\._vendor.*
129+
.+?\.tests.*
130+
.+?\._vendor.*

stubs/setuptools/METADATA.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "70.3.*"
1+
version = "71.0.*"
22
upstream_repository = "https://github.com/pypa/setuptools"
33

44
[tool.stubtest]

stubs/setuptools/pkg_resources/__init__.pyi

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import types
22
import zipimport
33
from _typeshed import BytesPath, Incomplete, StrOrBytesPath, StrPath, Unused
4+
from _typeshed.importlib import LoaderProtocol
45
from collections.abc import Callable, Generator, Iterable, Iterator, Sequence
56
from io import BytesIO
67
from itertools import chain
@@ -10,7 +11,7 @@ from typing import IO, Any, ClassVar, Final, Literal, NamedTuple, NoReturn, Prot
1011
from typing_extensions import Self, TypeAlias
1112
from zipfile import ZipInfo
1213

13-
from ._vendored_packaging import requirements as packaging_requirements, version as packaging_version
14+
from ._vendored_packaging import requirements as _packaging_requirements, version as _packaging_version
1415

1516
# defined in setuptools
1617
_T = TypeVar("_T")
@@ -29,10 +30,6 @@ _ProviderFactoryType: TypeAlias = Callable[[Any], IResourceProvider]
2930
_DistFinderType: TypeAlias = Callable[[_T, str, bool], Iterable[Distribution]]
3031
_NSHandlerType: TypeAlias = Callable[[_T, str, str, types.ModuleType], str | None]
3132

32-
# TODO: Use _typeshed.importlib.LoaderProtocol after mypy 1.11 is released
33-
class _LoaderProtocol(Protocol):
34-
def load_module(self, fullname: str, /) -> types.ModuleType: ...
35-
3633
__all__ = [
3734
"require",
3835
"run_script",
@@ -218,9 +215,9 @@ AvailableDistributions = Environment
218215

219216
def parse_requirements(strs: _NestedStr) -> Iterator[Requirement]: ...
220217

221-
class RequirementParseError(packaging_requirements.InvalidRequirement): ...
218+
class RequirementParseError(_packaging_requirements.InvalidRequirement): ...
222219

223-
class Requirement(packaging_requirements.Requirement):
220+
class Requirement(_packaging_requirements.Requirement):
224221
unsafe_name: str
225222
project_name: str
226223
key: str
@@ -369,7 +366,7 @@ def evaluate_marker(text: str, extra: Incomplete | None = None) -> bool: ...
369366
class NullProvider:
370367
egg_name: str | None
371368
egg_info: str | None
372-
loader: _LoaderProtocol | None
369+
loader: LoaderProtocol | None
373370
module_path: str
374371

375372
def __init__(self, module: _ModuleLike) -> None: ...
@@ -420,7 +417,7 @@ class Distribution(NullProvider):
420417
@property
421418
def key(self) -> str: ...
422419
@property
423-
def parsed_version(self) -> packaging_version.Version: ...
420+
def parsed_version(self) -> _packaging_version.Version: ...
424421
@property
425422
def version(self) -> str: ...
426423
def requires(self, extras: Iterable[str] = ()) -> list[Requirement]: ...
@@ -495,7 +492,7 @@ class FileMetadata(EmptyProvider):
495492

496493
class PEP440Warning(RuntimeWarning): ...
497494

498-
parse_version = packaging_version.Version
495+
parse_version = _packaging_version.Version
499496

500497
def yield_lines(iterable: _NestedStr) -> chain[str]: ...
501498
def split_sections(s: _NestedStr) -> Generator[tuple[str | None, list[str]], None, None]: ...

stubs/setuptools/pkg_resources/extern/__init__.pyi

Lines changed: 0 additions & 20 deletions
This file was deleted.

stubs/setuptools/setuptools/dist.pyi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from collections.abc import Iterable, Iterator, Mapping, MutableMapping
1+
from collections.abc import Iterable, Iterator, MutableMapping
22
from typing import Any
33

44
from . import Command, SetuptoolsDeprecationWarning
@@ -7,7 +7,6 @@ from ._distutils.dist import Distribution as _Distribution
77
__all__ = ["Distribution"]
88

99
class Distribution(_Distribution):
10-
def patch_missing_pkg_info(self, attrs: Mapping[str, Any]) -> None: ...
1110
src_root: str | None
1211
dependency_links: list[str]
1312
setup_requires: list[str]

stubs/setuptools/setuptools/extern/__init__.pyi

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)