From e79626bdc4476279bb0fff486b4839ed2aace35b Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 20 Mar 2025 14:08:40 +0100 Subject: [PATCH 01/12] [setuptools] Update to 77.0.1 Add setuptools._distutils.compilers.C.unix and setuptools._distutils.unixccompiler --- .../setuptools/@tests/stubtest_allowlist.txt | 3 - stubs/setuptools/METADATA.toml | 2 +- .../setuptools/_distutils/_msvccompiler.pyi | 2 + .../setuptools/_distutils/ccompiler.pyi | 10 +++- .../setuptools/setuptools/_distutils/cmd.pyi | 3 +- .../setuptools/_distutils/command/build.pyi | 2 - .../_distutils/compilers/C/msvc.pyi | 3 - .../_distutils/compilers/C/unix.pyi | 55 +++++++++++++++++++ .../setuptools/_distutils/unixccompiler.pyi | 3 + 9 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi create mode 100644 stubs/setuptools/setuptools/_distutils/unixccompiler.pyi diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index ef8af309865d..b271a7271295 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -32,9 +32,7 @@ setuptools._distutils.dist.Distribution.get_obsoletes setuptools._distutils.archive_util.ARCHIVE_FORMATS setuptools._distutils.archive_util.check_archive_formats setuptools._distutils.cmd.Command.dump_options -setuptools._distutils.command.build_clib.show_compilers setuptools._distutils.command.build_ext.extension_name_re -setuptools._distutils.command.build_ext.show_compilers setuptools._distutils.command.build_scripts setuptools._distutils.command.check setuptools._distutils.command.clean @@ -84,7 +82,6 @@ setuptools._distutils.fancy_getopt setuptools._distutils.file_util setuptools._distutils.log setuptools._distutils.text_file -setuptools._distutils.unixccompiler setuptools._distutils.version setuptools._distutils.versionpredicate setuptools._distutils.zosccompiler diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index f8c0ecb7c936..8fdd0af34125 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,4 +1,4 @@ -version = "~=76.0.0" +version = "~=77.0.1" 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/_distutils/_msvccompiler.pyi b/stubs/setuptools/setuptools/_distutils/_msvccompiler.pyi index 34d9735b0614..8471ccab28fa 100644 --- a/stubs/setuptools/setuptools/_distutils/_msvccompiler.pyi +++ b/stubs/setuptools/setuptools/_distutils/_msvccompiler.pyi @@ -1,3 +1,5 @@ from .compilers.C import msvc +__all__ = ["MSVCCompiler"] + MSVCCompiler = msvc.Compiler diff --git a/stubs/setuptools/setuptools/_distutils/ccompiler.pyi b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi index cbb794e101a0..3ed7e6be0e67 100644 --- a/stubs/setuptools/setuptools/_distutils/ccompiler.pyi +++ b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi @@ -1,10 +1,18 @@ from .compilers.C import base -from .compilers.C.base import gen_lib_options, gen_preprocess_options, get_default_compiler, new_compiler, show_compilers +from .compilers.C.base import ( + compiler_class as compiler_class, + gen_lib_options, + gen_preprocess_options, + get_default_compiler, + new_compiler, + show_compilers, +) from .compilers.C.errors import CompileError, LinkError __all__ = [ "CompileError", "LinkError", + "compiler_class", "gen_lib_options", "gen_preprocess_options", "get_default_compiler", diff --git a/stubs/setuptools/setuptools/_distutils/cmd.pyi b/stubs/setuptools/setuptools/_distutils/cmd.pyi index 2c22e460989c..40780774a81e 100644 --- a/stubs/setuptools/setuptools/_distutils/cmd.pyi +++ b/stubs/setuptools/setuptools/_distutils/cmd.pyi @@ -18,8 +18,7 @@ class Command: sub_commands: ClassVar[list[tuple[str, Callable[[Any], bool] | None]]] user_options: ClassVar[ # Specifying both because list is invariant. Avoids mypy override assignment issues - list[tuple[str, str, str]] - | list[tuple[str, str | None, str]] + list[tuple[str, str, str]] | list[tuple[str, str | None, str]] ] def __init__(self, dist: Distribution) -> None: ... def ensure_finalized(self) -> None: ... diff --git a/stubs/setuptools/setuptools/_distutils/command/build.pyi b/stubs/setuptools/setuptools/_distutils/command/build.pyi index c8a8bca6e61e..90b51a8b8a0a 100644 --- a/stubs/setuptools/setuptools/_distutils/command/build.pyi +++ b/stubs/setuptools/setuptools/_distutils/command/build.pyi @@ -4,8 +4,6 @@ from typing import ClassVar from ..cmd import Command -def show_compilers() -> None: ... - class build(Command): description: ClassVar[str] user_options: ClassVar[list[tuple[str, str | None, str]]] diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi index 2b419aa986d7..99d107c63217 100644 --- a/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi +++ b/stubs/setuptools/setuptools/_distutils/compilers/C/msvc.pyi @@ -1,4 +1,3 @@ -from _typeshed import Incomplete from typing import ClassVar, Final from . import base @@ -6,8 +5,6 @@ from . import base PLAT_SPEC_TO_RUNTIME: Final[dict[str, str]] class Compiler(base.Compiler): - compiler_type: ClassVar[str] - executables: ClassVar[dict[str, Incomplete]] src_extensions: ClassVar[list[str]] res_extension: ClassVar[str] obj_extension: ClassVar[str] diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi new file mode 100644 index 000000000000..83afddc3008c --- /dev/null +++ b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi @@ -0,0 +1,55 @@ +import os +from _typeshed import Incomplete +from collections.abc import Iterable +from typing import ClassVar + +from . import base + +class Compiler(base.Compiler): + src_extensions: ClassVar[list[str]] + obj_extension: ClassVar[str] + static_lib_extension: ClassVar[str] + shared_lib_extension: ClassVar[str] + dylib_lib_extension: ClassVar[str] + xcode_stub_lib_extension: ClassVar[str] + static_lib_format: ClassVar[str] + shared_lib_format: ClassVar[str] + dylib_lib_format: ClassVar[str] + xcode_stub_lib_format: ClassVar[str] + def preprocess( + self, + source: str | os.PathLike[str], + output_file: str | os.PathLike[str] | None = None, + macros: list[base._Macro] | None = None, + include_dirs: list[str] | tuple[str, ...] | None = None, + extra_preargs: list[str] | None = None, + extra_postargs: Iterable[str] | None = None, + ) -> None: ... + def create_static_lib( + self, + objects, + output_libname, + output_dir: Incomplete | None = None, + debug: bool = False, + target_lang: Incomplete | None = None, + ) -> None: ... + def link( + self, + target_desc, + objects: list[str] | tuple[str, ...], + output_filename, + output_dir: str | None = None, + libraries: list[str] | tuple[str, ...] | None = None, + library_dirs: list[str] | tuple[str, ...] | None = None, + runtime_library_dirs: list[str] | tuple[str, ...] | None = None, + export_symbols: Incomplete | None = None, + debug: bool = False, + extra_preargs: Incomplete | None = None, + extra_postargs: Incomplete | None = None, + build_temp: Incomplete | None = None, + target_lang: Incomplete | None = None, + ) -> None: ... + def library_dir_option(self, dir: str) -> str: ... + def runtime_library_dir_option(self, dir: str) -> str | list[str]: ... # type: ignore[override] + def library_option(self, lib: str) -> str: ... + def find_library_file(self, dirs, lib, debug: bool = False) -> str | None: ... diff --git a/stubs/setuptools/setuptools/_distutils/unixccompiler.pyi b/stubs/setuptools/setuptools/_distutils/unixccompiler.pyi new file mode 100644 index 000000000000..9cd30ad9a64e --- /dev/null +++ b/stubs/setuptools/setuptools/_distutils/unixccompiler.pyi @@ -0,0 +1,3 @@ +from .compilers.C import unix + +UnixCCompiler = unix.Compiler From f929262daff89216d01ee05465c7cceb4f8e4fff Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 13:10:36 +0000 Subject: [PATCH 02/12] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/setuptools/setuptools/_distutils/cmd.pyi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stubs/setuptools/setuptools/_distutils/cmd.pyi b/stubs/setuptools/setuptools/_distutils/cmd.pyi index 40780774a81e..2c22e460989c 100644 --- a/stubs/setuptools/setuptools/_distutils/cmd.pyi +++ b/stubs/setuptools/setuptools/_distutils/cmd.pyi @@ -18,7 +18,8 @@ class Command: sub_commands: ClassVar[list[tuple[str, Callable[[Any], bool] | None]]] user_options: ClassVar[ # Specifying both because list is invariant. Avoids mypy override assignment issues - list[tuple[str, str, str]] | list[tuple[str, str | None, str]] + list[tuple[str, str, str]] + | list[tuple[str, str | None, str]] ] def __init__(self, dist: Distribution) -> None: ... def ensure_finalized(self) -> None: ... From c21e55593124b264bccfbf8c64fc7b881504aab9 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 20 Mar 2025 14:11:31 +0100 Subject: [PATCH 03/12] Copy files to distutils --- .../setuptools/distutils/compilers/C/unix.pyi | 55 +++++++++++++++++++ stubs/setuptools/distutils/unixccompiler.pyi | 3 + 2 files changed, 58 insertions(+) create mode 100644 stubs/setuptools/distutils/compilers/C/unix.pyi create mode 100644 stubs/setuptools/distutils/unixccompiler.pyi diff --git a/stubs/setuptools/distutils/compilers/C/unix.pyi b/stubs/setuptools/distutils/compilers/C/unix.pyi new file mode 100644 index 000000000000..83afddc3008c --- /dev/null +++ b/stubs/setuptools/distutils/compilers/C/unix.pyi @@ -0,0 +1,55 @@ +import os +from _typeshed import Incomplete +from collections.abc import Iterable +from typing import ClassVar + +from . import base + +class Compiler(base.Compiler): + src_extensions: ClassVar[list[str]] + obj_extension: ClassVar[str] + static_lib_extension: ClassVar[str] + shared_lib_extension: ClassVar[str] + dylib_lib_extension: ClassVar[str] + xcode_stub_lib_extension: ClassVar[str] + static_lib_format: ClassVar[str] + shared_lib_format: ClassVar[str] + dylib_lib_format: ClassVar[str] + xcode_stub_lib_format: ClassVar[str] + def preprocess( + self, + source: str | os.PathLike[str], + output_file: str | os.PathLike[str] | None = None, + macros: list[base._Macro] | None = None, + include_dirs: list[str] | tuple[str, ...] | None = None, + extra_preargs: list[str] | None = None, + extra_postargs: Iterable[str] | None = None, + ) -> None: ... + def create_static_lib( + self, + objects, + output_libname, + output_dir: Incomplete | None = None, + debug: bool = False, + target_lang: Incomplete | None = None, + ) -> None: ... + def link( + self, + target_desc, + objects: list[str] | tuple[str, ...], + output_filename, + output_dir: str | None = None, + libraries: list[str] | tuple[str, ...] | None = None, + library_dirs: list[str] | tuple[str, ...] | None = None, + runtime_library_dirs: list[str] | tuple[str, ...] | None = None, + export_symbols: Incomplete | None = None, + debug: bool = False, + extra_preargs: Incomplete | None = None, + extra_postargs: Incomplete | None = None, + build_temp: Incomplete | None = None, + target_lang: Incomplete | None = None, + ) -> None: ... + def library_dir_option(self, dir: str) -> str: ... + def runtime_library_dir_option(self, dir: str) -> str | list[str]: ... # type: ignore[override] + def library_option(self, lib: str) -> str: ... + def find_library_file(self, dirs, lib, debug: bool = False) -> str | None: ... diff --git a/stubs/setuptools/distutils/unixccompiler.pyi b/stubs/setuptools/distutils/unixccompiler.pyi new file mode 100644 index 000000000000..9cd30ad9a64e --- /dev/null +++ b/stubs/setuptools/distutils/unixccompiler.pyi @@ -0,0 +1,3 @@ +from .compilers.C import unix + +UnixCCompiler = unix.Compiler From cfad6eea8ae8dbcd52fe246b2a8bf8ff55784b87 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 20 Mar 2025 14:17:45 +0100 Subject: [PATCH 04/12] Try to fix import weirdness --- stubs/setuptools/distutils/compilers/C/unix.pyi | 3 ++- stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stubs/setuptools/distutils/compilers/C/unix.pyi b/stubs/setuptools/distutils/compilers/C/unix.pyi index 83afddc3008c..0acd6191d398 100644 --- a/stubs/setuptools/distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/distutils/compilers/C/unix.pyi @@ -4,6 +4,7 @@ from collections.abc import Iterable from typing import ClassVar from . import base +from .base import _Macro class Compiler(base.Compiler): src_extensions: ClassVar[list[str]] @@ -20,7 +21,7 @@ class Compiler(base.Compiler): self, source: str | os.PathLike[str], output_file: str | os.PathLike[str] | None = None, - macros: list[base._Macro] | None = None, + macros: list[_Macro] | None = None, include_dirs: list[str] | tuple[str, ...] | None = None, extra_preargs: list[str] | None = None, extra_postargs: Iterable[str] | None = None, diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi index 83afddc3008c..0acd6191d398 100644 --- a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi @@ -4,6 +4,7 @@ from collections.abc import Iterable from typing import ClassVar from . import base +from .base import _Macro class Compiler(base.Compiler): src_extensions: ClassVar[list[str]] @@ -20,7 +21,7 @@ class Compiler(base.Compiler): self, source: str | os.PathLike[str], output_file: str | os.PathLike[str] | None = None, - macros: list[base._Macro] | None = None, + macros: list[_Macro] | None = None, include_dirs: list[str] | tuple[str, ...] | None = None, extra_preargs: list[str] | None = None, extra_postargs: Iterable[str] | None = None, From 62dde77e438941b46721d9dd0f24aa7220a76675 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 20 Mar 2025 14:21:06 +0100 Subject: [PATCH 05/12] Copy type alias --- stubs/setuptools/distutils/compilers/C/unix.pyi | 5 +++-- stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/stubs/setuptools/distutils/compilers/C/unix.pyi b/stubs/setuptools/distutils/compilers/C/unix.pyi index 0acd6191d398..d16d0bde1371 100644 --- a/stubs/setuptools/distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/distutils/compilers/C/unix.pyi @@ -1,10 +1,11 @@ import os from _typeshed import Incomplete from collections.abc import Iterable -from typing import ClassVar +from typing import ClassVar, TypeAlias from . import base -from .base import _Macro + +_Macro: TypeAlias = tuple[str] | tuple[str, str | None] class Compiler(base.Compiler): src_extensions: ClassVar[list[str]] diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi index 0acd6191d398..d16d0bde1371 100644 --- a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi @@ -1,10 +1,11 @@ import os from _typeshed import Incomplete from collections.abc import Iterable -from typing import ClassVar +from typing import ClassVar, TypeAlias from . import base -from .base import _Macro + +_Macro: TypeAlias = tuple[str] | tuple[str, str | None] class Compiler(base.Compiler): src_extensions: ClassVar[list[str]] From cdbe8a3ac21f641d3e744ddb01a23c427522285b Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 20 Mar 2025 14:24:30 +0100 Subject: [PATCH 06/12] Use TypeAlias from typing_extensions --- stubs/setuptools/distutils/compilers/C/unix.pyi | 3 ++- stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stubs/setuptools/distutils/compilers/C/unix.pyi b/stubs/setuptools/distutils/compilers/C/unix.pyi index d16d0bde1371..de582768024c 100644 --- a/stubs/setuptools/distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/distutils/compilers/C/unix.pyi @@ -1,7 +1,8 @@ import os from _typeshed import Incomplete from collections.abc import Iterable -from typing import ClassVar, TypeAlias +from typing import ClassVar +from typing_extensions import TypeAlias from . import base diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi index d16d0bde1371..de582768024c 100644 --- a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi @@ -1,7 +1,8 @@ import os from _typeshed import Incomplete from collections.abc import Iterable -from typing import ClassVar, TypeAlias +from typing import ClassVar +from typing_extensions import TypeAlias from . import base From 681c338e803a39d724d668eec183bc72bf9222fc Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 20 Mar 2025 14:30:24 +0100 Subject: [PATCH 07/12] Remove inherited methods --- .../setuptools/distutils/compilers/C/unix.pyi | 42 ------------------- .../_distutils/compilers/C/unix.pyi | 42 ------------------- 2 files changed, 84 deletions(-) diff --git a/stubs/setuptools/distutils/compilers/C/unix.pyi b/stubs/setuptools/distutils/compilers/C/unix.pyi index de582768024c..2e78f191dd55 100644 --- a/stubs/setuptools/distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/distutils/compilers/C/unix.pyi @@ -1,13 +1,7 @@ -import os -from _typeshed import Incomplete -from collections.abc import Iterable from typing import ClassVar -from typing_extensions import TypeAlias from . import base -_Macro: TypeAlias = tuple[str] | tuple[str, str | None] - class Compiler(base.Compiler): src_extensions: ClassVar[list[str]] obj_extension: ClassVar[str] @@ -19,40 +13,4 @@ class Compiler(base.Compiler): shared_lib_format: ClassVar[str] dylib_lib_format: ClassVar[str] xcode_stub_lib_format: ClassVar[str] - def preprocess( - self, - source: str | os.PathLike[str], - output_file: str | os.PathLike[str] | None = None, - macros: list[_Macro] | None = None, - include_dirs: list[str] | tuple[str, ...] | None = None, - extra_preargs: list[str] | None = None, - extra_postargs: Iterable[str] | None = None, - ) -> None: ... - def create_static_lib( - self, - objects, - output_libname, - output_dir: Incomplete | None = None, - debug: bool = False, - target_lang: Incomplete | None = None, - ) -> None: ... - def link( - self, - target_desc, - objects: list[str] | tuple[str, ...], - output_filename, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - export_symbols: Incomplete | None = None, - debug: bool = False, - extra_preargs: Incomplete | None = None, - extra_postargs: Incomplete | None = None, - build_temp: Incomplete | None = None, - target_lang: Incomplete | None = None, - ) -> None: ... - def library_dir_option(self, dir: str) -> str: ... def runtime_library_dir_option(self, dir: str) -> str | list[str]: ... # type: ignore[override] - def library_option(self, lib: str) -> str: ... - def find_library_file(self, dirs, lib, debug: bool = False) -> str | None: ... diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi index de582768024c..2e78f191dd55 100644 --- a/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/setuptools/_distutils/compilers/C/unix.pyi @@ -1,13 +1,7 @@ -import os -from _typeshed import Incomplete -from collections.abc import Iterable from typing import ClassVar -from typing_extensions import TypeAlias from . import base -_Macro: TypeAlias = tuple[str] | tuple[str, str | None] - class Compiler(base.Compiler): src_extensions: ClassVar[list[str]] obj_extension: ClassVar[str] @@ -19,40 +13,4 @@ class Compiler(base.Compiler): shared_lib_format: ClassVar[str] dylib_lib_format: ClassVar[str] xcode_stub_lib_format: ClassVar[str] - def preprocess( - self, - source: str | os.PathLike[str], - output_file: str | os.PathLike[str] | None = None, - macros: list[_Macro] | None = None, - include_dirs: list[str] | tuple[str, ...] | None = None, - extra_preargs: list[str] | None = None, - extra_postargs: Iterable[str] | None = None, - ) -> None: ... - def create_static_lib( - self, - objects, - output_libname, - output_dir: Incomplete | None = None, - debug: bool = False, - target_lang: Incomplete | None = None, - ) -> None: ... - def link( - self, - target_desc, - objects: list[str] | tuple[str, ...], - output_filename, - output_dir: str | None = None, - libraries: list[str] | tuple[str, ...] | None = None, - library_dirs: list[str] | tuple[str, ...] | None = None, - runtime_library_dirs: list[str] | tuple[str, ...] | None = None, - export_symbols: Incomplete | None = None, - debug: bool = False, - extra_preargs: Incomplete | None = None, - extra_postargs: Incomplete | None = None, - build_temp: Incomplete | None = None, - target_lang: Incomplete | None = None, - ) -> None: ... - def library_dir_option(self, dir: str) -> str: ... def runtime_library_dir_option(self, dir: str) -> str | list[str]: ... # type: ignore[override] - def library_option(self, lib: str) -> str: ... - def find_library_file(self, dirs, lib, debug: bool = False) -> str | None: ... From 8d9de3f57e60c3e436a5caadf78883cd1852e182 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 27 Mar 2025 12:52:03 +0100 Subject: [PATCH 08/12] Just re-export in setuptools.distutils Co-authored-by: Avasam --- stubs/setuptools/distutils/compilers/C/unix.pyi | 17 +---------------- stubs/setuptools/distutils/unixccompiler.pyi | 4 +--- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/stubs/setuptools/distutils/compilers/C/unix.pyi b/stubs/setuptools/distutils/compilers/C/unix.pyi index 2e78f191dd55..d4dbeff6b110 100644 --- a/stubs/setuptools/distutils/compilers/C/unix.pyi +++ b/stubs/setuptools/distutils/compilers/C/unix.pyi @@ -1,16 +1 @@ -from typing import ClassVar - -from . import base - -class Compiler(base.Compiler): - src_extensions: ClassVar[list[str]] - obj_extension: ClassVar[str] - static_lib_extension: ClassVar[str] - shared_lib_extension: ClassVar[str] - dylib_lib_extension: ClassVar[str] - xcode_stub_lib_extension: ClassVar[str] - static_lib_format: ClassVar[str] - shared_lib_format: ClassVar[str] - dylib_lib_format: ClassVar[str] - xcode_stub_lib_format: ClassVar[str] - def runtime_library_dir_option(self, dir: str) -> str | list[str]: ... # type: ignore[override] +from setuptools._distutils.compilers.C.unix import * diff --git a/stubs/setuptools/distutils/unixccompiler.pyi b/stubs/setuptools/distutils/unixccompiler.pyi index 9cd30ad9a64e..b749836286ba 100644 --- a/stubs/setuptools/distutils/unixccompiler.pyi +++ b/stubs/setuptools/distutils/unixccompiler.pyi @@ -1,3 +1 @@ -from .compilers.C import unix - -UnixCCompiler = unix.Compiler +from setuptools._distutils.unixcompiler import * From f0116bf2eee5b5129716b546a7f289162f4cebe8 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 27 Mar 2025 12:56:50 +0100 Subject: [PATCH 09/12] Fix typo in import --- stubs/setuptools/distutils/unixccompiler.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/setuptools/distutils/unixccompiler.pyi b/stubs/setuptools/distutils/unixccompiler.pyi index b749836286ba..fcbf9e199041 100644 --- a/stubs/setuptools/distutils/unixccompiler.pyi +++ b/stubs/setuptools/distutils/unixccompiler.pyi @@ -1 +1 @@ -from setuptools._distutils.unixcompiler import * +from setuptools._distutils.unixccompiler import * From fccf5cbd79104a1fd7b871a4348513aee187072e Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 27 Mar 2025 13:02:19 +0100 Subject: [PATCH 10/12] Remove an item from __all__ --- stubs/setuptools/METADATA.toml | 2 +- stubs/setuptools/setuptools/_distutils/ccompiler.pyi | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index 8fdd0af34125..b5b04e04ff19 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,4 +1,4 @@ -version = "~=77.0.1" +version = "~=77.0.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/_distutils/ccompiler.pyi b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi index 3ed7e6be0e67..e037f5e67361 100644 --- a/stubs/setuptools/setuptools/_distutils/ccompiler.pyi +++ b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi @@ -1,6 +1,5 @@ from .compilers.C import base from .compilers.C.base import ( - compiler_class as compiler_class, gen_lib_options, gen_preprocess_options, get_default_compiler, @@ -12,7 +11,6 @@ from .compilers.C.errors import CompileError, LinkError __all__ = [ "CompileError", "LinkError", - "compiler_class", "gen_lib_options", "gen_preprocess_options", "get_default_compiler", From e3e8146fafc56c82b30b9dd6bdb400f17f243a54 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 27 Mar 2025 12:04:01 +0000 Subject: [PATCH 11/12] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/setuptools/setuptools/_distutils/ccompiler.pyi | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/stubs/setuptools/setuptools/_distutils/ccompiler.pyi b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi index e037f5e67361..cbb794e101a0 100644 --- a/stubs/setuptools/setuptools/_distutils/ccompiler.pyi +++ b/stubs/setuptools/setuptools/_distutils/ccompiler.pyi @@ -1,11 +1,5 @@ from .compilers.C import base -from .compilers.C.base import ( - gen_lib_options, - gen_preprocess_options, - get_default_compiler, - new_compiler, - show_compilers, -) +from .compilers.C.base import gen_lib_options, gen_preprocess_options, get_default_compiler, new_compiler, show_compilers from .compilers.C.errors import CompileError, LinkError __all__ = [ From cad13be2952f5d0dd82faf243ab52a140e87c4c8 Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Thu, 27 Mar 2025 13:05:24 +0100 Subject: [PATCH 12/12] Add setuptools._distutils.compat.numpy to stubtest allowlist --- stubs/setuptools/@tests/stubtest_allowlist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index b271a7271295..20e9c75ba049 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -73,6 +73,7 @@ setuptools._distutils.command.config setuptools._distutils.command.install_data setuptools._distutils.command.install_egg_info setuptools._distutils.command.install_headers +setuptools._distutils.compat.numpy setuptools._distutils.compat.py39 setuptools._distutils.core setuptools._distutils.cygwinccompiler