From 676345292f1e399a683814270b818cd43d38417d Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 3 Nov 2026 12:57:06 -0500 Subject: [PATCH 1/2] Bump setuptools to 84.2.* --- stubs/setuptools/@tests/stubtest_allowlist.txt | 3 --- stubs/setuptools/METADATA.toml | 2 +- stubs/setuptools/setuptools/archive_util.pyi | 10 ++++++---- stubs/setuptools/setuptools/command/bdist_wheel.pyi | 3 +++ stubs/setuptools/setuptools/command/build_ext.pyi | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index f1daacd06921..68260f90c9ba 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -1,6 +1,3 @@ -# Is a functools.partial, so stubtest says "is not a function" -setuptools._distutils._modified.newer_pairwise_group - # Dynamically created in __init__ setuptools._distutils.dist.Distribution.get_name setuptools._distutils.dist.Distribution.get_version diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index f7ba41591377..cd485440d695 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,4 +1,4 @@ -version = "84.0.*" +version = "84.2.*" upstream-repository = "https://github.com/pypa/setuptools" extra-description = """\ Given that `pkg_resources` is typed since `setuptools >= 71.1`, \ diff --git a/stubs/setuptools/setuptools/archive_util.pyi b/stubs/setuptools/setuptools/archive_util.pyi index acadce09a7ca..c6421763550a 100644 --- a/stubs/setuptools/setuptools/archive_util.pyi +++ b/stubs/setuptools/setuptools/archive_util.pyi @@ -4,16 +4,18 @@ from collections.abc import Callable from ._distutils.errors import DistutilsError __all__ = [ - "unpack_archive", - "unpack_zipfile", - "unpack_tarfile", - "default_filter", "UnrecognizedFormat", + "UnsafeMember", + "default_filter", "extraction_drivers", + "unpack_archive", "unpack_directory", + "unpack_tarfile", + "unpack_zipfile", ] class UnrecognizedFormat(DistutilsError): ... +class UnsafeMember(DistutilsError): ... def default_filter(src, dst): ... def unpack_archive(filename, extract_dir, progress_filter=..., drivers=None) -> None: ... diff --git a/stubs/setuptools/setuptools/command/bdist_wheel.pyi b/stubs/setuptools/setuptools/command/bdist_wheel.pyi index d6538ab52d4c..6164aec7c0ea 100644 --- a/stubs/setuptools/setuptools/command/bdist_wheel.pyi +++ b/stubs/setuptools/setuptools/command/bdist_wheel.pyi @@ -15,6 +15,7 @@ def get_platform(archive_root: str | None) -> str: ... def get_flag(var: str, fallback: bool, expected: bool = True, warn: bool = True) -> bool: ... def get_abi_tag() -> str | None: ... def safer_version(version: str) -> str: ... +def stable_abi_tag(impl_name: str, impl_version: str) -> Literal["abi3", "abi3.abi3t"] | None: ... class bdist_wheel(Command): description: ClassVar[str] @@ -46,6 +47,8 @@ class bdist_wheel(Command): def finalize_options(self) -> None: ... @property def wheel_dist_name(self) -> str: ... + @property + def abi_tag(self) -> str: ... def get_tag(self) -> tuple[str, str, str]: ... def run(self) -> None: ... def write_wheelfile(self, wheelfile_base: str, generator: str = ...) -> None: ... diff --git a/stubs/setuptools/setuptools/command/build_ext.pyi b/stubs/setuptools/setuptools/command/build_ext.pyi index 34366afb3ee0..36109e8fd1c7 100644 --- a/stubs/setuptools/setuptools/command/build_ext.pyi +++ b/stubs/setuptools/setuptools/command/build_ext.pyi @@ -9,7 +9,7 @@ have_rtld: bool use_stubs: bool libtype: str -def get_abi3_suffix(): ... +def get_abi3_suffix() -> str | None: ... class build_ext(_build_ext): distribution: Distribution # override distutils.dist.Distribution with setuptools.dist.Distribution From 8cec0bb596a52c8815d1d67392fe9175886f725e Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 3 Nov 2026 13:13:34 -0500 Subject: [PATCH 2/2] Restore stubtest allowlist --- stubs/setuptools/@tests/stubtest_allowlist.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index 68260f90c9ba..f1daacd06921 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -1,3 +1,6 @@ +# Is a functools.partial, so stubtest says "is not a function" +setuptools._distutils._modified.newer_pairwise_group + # Dynamically created in __init__ setuptools._distutils.dist.Distribution.get_name setuptools._distutils.dist.Distribution.get_version