diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index a1b63cca5..29d7ddcc0 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/stubs/setuptools/@tests/stubtest_allowlist.txt @@ -44,32 +44,19 @@ setuptools._distutils.ccompiler.CCompiler.out_extensions setuptools._distutils.ccompiler.CCompiler.set_executable setuptools._distutils.ccompiler.compiler_class setuptools._distutils.cmd.Command.dump_options -setuptools._distutils.command.bdist -setuptools._distutils.command.bdist_rpm -setuptools._distutils.command.build -setuptools._distutils.command.build_clib 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_ext -setuptools._distutils.command.build_py setuptools._distutils.command.build_scripts setuptools._distutils.command.check setuptools._distutils.command.clean -setuptools._distutils.command.install setuptools._distutils.command.install_data setuptools._distutils.command.install_headers -setuptools._distutils.command.install_lib -setuptools._distutils.command.install_scripts setuptools._distutils.command.install.HAS_USER_SITE setuptools._distutils.command.install.INSTALL_SCHEMES setuptools._distutils.command.install.SCHEME_KEYS setuptools._distutils.command.install.WINDOWS_SCHEME setuptools._distutils.command.install_lib.PYTHON_SOURCE_EXTENSION -setuptools._distutils.command.sdist -setuptools._distutils.command.register -setuptools._distutils.command.upload -setuptools._distutils.config.DEFAULT_PYPIRC setuptools._distutils.dist.DistributionMetadata.set_classifiers setuptools._distutils.dist.DistributionMetadata.set_keywords setuptools._distutils.dist.DistributionMetadata.set_platforms @@ -93,7 +80,7 @@ setuptools._distutils.util.MACOSX_VERSION_VAR # Missing submodules from setuptools._distutils # (Many of these may be implementation details, # but they can be added if people ask for them) -setuptools._distutils.bcppcompiler +setuptools._distutils.command.__all__ setuptools._distutils.command.bdist_dumb setuptools._distutils.command.build_scripts setuptools._distutils.command.check diff --git a/stubs/setuptools/@tests/test_cases/check_distutils.py b/stubs/setuptools/@tests/test_cases/check_distutils.py index 6cf41dc7c..78777f588 100644 --- a/stubs/setuptools/@tests/test_cases/check_distutils.py +++ b/stubs/setuptools/@tests/test_cases/check_distutils.py @@ -1,5 +1,3 @@ import distutils.command.sdist -import distutils.config -d = distutils.config.PyPIRCCommand c = distutils.command.sdist.sdist diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index 47969f29c..214f7f5b0 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,4 +1,4 @@ -version = "74.1.*" +version = "75.0.*" upstream_repository = "https://github.com/pypa/setuptools" extra_description = """\ If using `setuptools >= 71.1` *only* for `pkg_resources`, diff --git a/stubs/setuptools/distutils/command/__init__.pyi b/stubs/setuptools/distutils/command/__init__.pyi new file mode 100644 index 000000000..adeb472a5 --- /dev/null +++ b/stubs/setuptools/distutils/command/__init__.pyi @@ -0,0 +1,39 @@ +from . import ( + bdist as bdist, + bdist_rpm as bdist_rpm, + build as build, + build_clib as build_clib, + build_ext as build_ext, + build_py as build_py, + # build_scripts as build_scripts, + # check as check, + # clean as clean, + install as install, + # install_data as install_data, + # install_headers as install_headers, + install_lib as install_lib, + install_scripts as install_scripts, + sdist as sdist, +) + +# Commented out commands are not stubbed. +# (Many of these may be implementation details, +# but they can be added if people ask for them) +__all__ = [ + "build", + "build_py", + "build_ext", + "build_clib", + # "build_scripts", + # "clean", + "install", + "install_lib", + # "install_headers", + "install_scripts", + # "install_data", + "sdist", + "bdist", + # "bdist_dumb", + "bdist_rpm", + # "check", +] diff --git a/stubs/setuptools/distutils/command/register.pyi b/stubs/setuptools/distutils/command/register.pyi deleted file mode 100644 index 83d12de0f..000000000 --- a/stubs/setuptools/distutils/command/register.pyi +++ /dev/null @@ -1 +0,0 @@ -from setuptools._distutils.command.register import * diff --git a/stubs/setuptools/distutils/command/upload.pyi b/stubs/setuptools/distutils/command/upload.pyi deleted file mode 100644 index 640d7bf91..000000000 --- a/stubs/setuptools/distutils/command/upload.pyi +++ /dev/null @@ -1 +0,0 @@ -from setuptools._distutils.command.upload import * diff --git a/stubs/setuptools/distutils/config.pyi b/stubs/setuptools/distutils/config.pyi deleted file mode 100644 index ebd367c2d..000000000 --- a/stubs/setuptools/distutils/config.pyi +++ /dev/null @@ -1 +0,0 @@ -from setuptools._distutils.config import * diff --git a/stubs/setuptools/setuptools/__init__.pyi b/stubs/setuptools/setuptools/__init__.pyi index c2875da23..e15c40197 100644 --- a/stubs/setuptools/setuptools/__init__.pyi +++ b/stubs/setuptools/setuptools/__init__.pyi @@ -21,13 +21,10 @@ from .command.install import install from .command.install_egg_info import install_egg_info from .command.install_lib import install_lib from .command.install_scripts import install_scripts -from .command.register import register from .command.rotate import rotate from .command.saveopts import saveopts from .command.sdist import sdist from .command.setopt import setopt -from .command.upload import upload -from .command.upload_docs import upload_docs from .depends import Require as Require from .dist import Distribution as Distribution from .extension import Extension as Extension @@ -142,8 +139,6 @@ class Command(_Command): @overload def get_finalized_command(self, command: Literal["install_scripts"], create: bool | Literal[0, 1] = 1) -> install_scripts: ... # type: ignore[overload-overlap] @overload - def get_finalized_command(self, command: Literal["register"], create: bool | Literal[0, 1] = 1) -> register: ... # type: ignore[overload-overlap] - @overload def get_finalized_command(self, command: Literal["rotate"], create: bool | Literal[0, 1] = 1) -> rotate: ... @overload def get_finalized_command(self, command: Literal["saveopts"], create: bool | Literal[0, 1] = 1) -> saveopts: ... @@ -152,10 +147,6 @@ class Command(_Command): @overload def get_finalized_command(self, command: Literal["setopt"], create: bool | Literal[0, 1] = 1) -> setopt: ... @overload - def get_finalized_command(self, command: Literal["upload"], create: bool | Literal[0, 1] = 1) -> upload: ... # type: ignore[overload-overlap] - @overload - def get_finalized_command(self, command: Literal["upload_docs"], create: bool | Literal[0, 1] = 1) -> upload_docs: ... # type: ignore[overload-overlap] - @overload def get_finalized_command(self, command: str, create: bool | Literal[0, 1] = 1) -> Command: ... @overload # type: ignore[override] # Extra **kw param def reinitialize_command(self, command: Literal["alias"], reinit_subcommands: bool = False, **kw) -> alias: ... @@ -198,8 +189,6 @@ class Command(_Command): self, command: Literal["install_scripts"], reinit_subcommands: bool = False, **kw ) -> install_scripts: ... @overload - def reinitialize_command(self, command: Literal["register"], reinit_subcommands: bool = False, **kw) -> register: ... - @overload def reinitialize_command(self, command: Literal["rotate"], reinit_subcommands: bool = False, **kw) -> rotate: ... @overload def reinitialize_command(self, command: Literal["saveopts"], reinit_subcommands: bool = False, **kw) -> saveopts: ... @@ -208,10 +197,6 @@ class Command(_Command): @overload def reinitialize_command(self, command: Literal["setopt"], reinit_subcommands: bool = False, **kw) -> setopt: ... @overload - def reinitialize_command(self, command: Literal["upload"], reinit_subcommands: bool = False, **kw) -> upload: ... - @overload - def reinitialize_command(self, command: Literal["upload_docs"], reinit_subcommands: bool = False, **kw) -> upload_docs: ... - @overload def reinitialize_command(self, command: str, reinit_subcommands: bool = False, **kw) -> Command: ... @overload def reinitialize_command(self, command: _CommandT, reinit_subcommands: bool = False, **kw) -> _CommandT: ... diff --git a/stubs/setuptools/setuptools/_distutils/archive_util.pyi b/stubs/setuptools/setuptools/_distutils/archive_util.pyi index 0c47c381c..c2b9566e1 100644 --- a/stubs/setuptools/setuptools/_distutils/archive_util.pyi +++ b/stubs/setuptools/setuptools/_distutils/archive_util.pyi @@ -1,5 +1,5 @@ from _typeshed import StrOrBytesPath, StrPath -from typing import overload +from typing import Literal, overload @overload def make_archive( @@ -26,10 +26,10 @@ def make_archive( def make_tarball( base_name: str, base_dir: StrPath, - compress: str | None = ..., + compress: Literal["gzip", "bzip2", "xz"] | None = "gzip", verbose: bool = False, dry_run: bool = False, - owner: str | None = ..., - group: str | None = ..., + owner: str | None = None, + group: str | None = None, ) -> str: ... def make_zipfile(base_name: str, base_dir: str, verbose: bool = False, dry_run: bool = False) -> str: ... diff --git a/stubs/setuptools/setuptools/_distutils/command/__init__.pyi b/stubs/setuptools/setuptools/_distutils/command/__init__.pyi new file mode 100644 index 000000000..adeb472a5 --- /dev/null +++ b/stubs/setuptools/setuptools/_distutils/command/__init__.pyi @@ -0,0 +1,39 @@ +from . import ( + bdist as bdist, + bdist_rpm as bdist_rpm, + build as build, + build_clib as build_clib, + build_ext as build_ext, + build_py as build_py, + # build_scripts as build_scripts, + # check as check, + # clean as clean, + install as install, + # install_data as install_data, + # install_headers as install_headers, + install_lib as install_lib, + install_scripts as install_scripts, + sdist as sdist, +) + +# Commented out commands are not stubbed. +# (Many of these may be implementation details, +# but they can be added if people ask for them) +__all__ = [ + "build", + "build_py", + "build_ext", + "build_clib", + # "build_scripts", + # "clean", + "install", + "install_lib", + # "install_headers", + "install_scripts", + # "install_data", + "sdist", + "bdist", + # "bdist_dumb", + "bdist_rpm", + # "check", +] diff --git a/stubs/setuptools/setuptools/_distutils/command/register.pyi b/stubs/setuptools/setuptools/_distutils/command/register.pyi deleted file mode 100644 index aed590b45..000000000 --- a/stubs/setuptools/setuptools/_distutils/command/register.pyi +++ /dev/null @@ -1,30 +0,0 @@ -from _typeshed import Incomplete -from collections.abc import Iterable, Iterator -from typing import AnyStr, TypeVar, overload - -from ..config import PyPIRCCommand - -_T = TypeVar("_T") - -class register(PyPIRCCommand): - description: str - list_classifiers: int - strict: int - def initialize_options(self) -> None: ... - def finalize_options(self) -> None: ... - def run(self) -> None: ... - def check_metadata(self) -> None: ... - def classifiers(self) -> None: ... - def verify_metadata(self) -> None: ... - def send_metadata(self) -> None: ... - def build_post_data(self, action): ... - def post_to_server(self, data, auth: Incomplete | None = ...): ... - -@overload -def make_iterable(values: None) -> list[None]: ... -@overload -def make_iterable(values: AnyStr) -> Iterator[AnyStr]: ... -@overload -def make_iterable(values: Iterable[_T]) -> Iterator[_T]: ... -@overload -def make_iterable(values: _T) -> Iterator[_T]: ... diff --git a/stubs/setuptools/setuptools/_distutils/command/sdist.pyi b/stubs/setuptools/setuptools/_distutils/command/sdist.pyi index 98663449f..a84fbef2a 100644 --- a/stubs/setuptools/setuptools/_distutils/command/sdist.pyi +++ b/stubs/setuptools/setuptools/_distutils/command/sdist.pyi @@ -1,7 +1,6 @@ from _typeshed import Incomplete, Unused from collections.abc import Callable from typing import ClassVar -from typing_extensions import deprecated from ..cmd import Command @@ -34,8 +33,6 @@ class sdist(Command): def finalize_options(self) -> None: ... filelist: Incomplete def run(self) -> None: ... - @deprecated("distutils.command.sdist.check_metadata is deprecated, use the check command instead") - def check_metadata(self) -> None: ... def get_file_list(self) -> None: ... def add_defaults(self) -> None: ... def read_template(self) -> None: ... diff --git a/stubs/setuptools/setuptools/_distutils/command/upload.pyi b/stubs/setuptools/setuptools/_distutils/command/upload.pyi deleted file mode 100644 index ab350ece6..000000000 --- a/stubs/setuptools/setuptools/_distutils/command/upload.pyi +++ /dev/null @@ -1,30 +0,0 @@ -from _typeshed import Incomplete, StrOrBytesPath -from collections.abc import Iterable, Iterator -from typing import AnyStr, ClassVar, TypeVar, overload - -from ..config import PyPIRCCommand - -_T = TypeVar("_T") - -class upload(PyPIRCCommand): - description: ClassVar[str] - username: str - password: str - show_response: int - sign: bool - identity: Incomplete - def initialize_options(self) -> None: ... - repository: Incomplete - realm: Incomplete - def finalize_options(self) -> None: ... - def run(self) -> None: ... - def upload_file(self, command: str, pyversion: str, filename: StrOrBytesPath) -> None: ... - -@overload -def make_iterable(values: None) -> list[None]: ... -@overload -def make_iterable(values: AnyStr) -> Iterator[AnyStr]: ... -@overload -def make_iterable(values: Iterable[_T]) -> Iterator[_T]: ... -@overload -def make_iterable(values: _T) -> Iterator[_T]: ... diff --git a/stubs/setuptools/setuptools/_distutils/config.pyi b/stubs/setuptools/setuptools/_distutils/config.pyi deleted file mode 100644 index 4dfa5e97f..000000000 --- a/stubs/setuptools/setuptools/_distutils/config.pyi +++ /dev/null @@ -1,16 +0,0 @@ -from abc import abstractmethod -from typing import ClassVar - -from .cmd import Command - -class PyPIRCCommand(Command): - DEFAULT_REPOSITORY: ClassVar[str] - DEFAULT_REALM: ClassVar[str] - repository: None - realm: None - user_options: ClassVar[list[tuple[str, str | None, str]]] - boolean_options: ClassVar[list[str]] - def initialize_options(self) -> None: ... - def finalize_options(self) -> None: ... - @abstractmethod - def run(self) -> None: ... diff --git a/stubs/setuptools/setuptools/command/register.pyi b/stubs/setuptools/setuptools/command/register.pyi deleted file mode 100644 index aa1067e75..000000000 --- a/stubs/setuptools/setuptools/command/register.pyi +++ /dev/null @@ -1,7 +0,0 @@ -from setuptools.dist import Distribution - -from .._distutils.command import register as orig - -class register(orig.register): - distribution: Distribution # override distutils.dist.Distribution with setuptools.dist.Distribution - def run(self) -> None: ... diff --git a/stubs/setuptools/setuptools/command/upload.pyi b/stubs/setuptools/setuptools/command/upload.pyi deleted file mode 100644 index ed84ddab0..000000000 --- a/stubs/setuptools/setuptools/command/upload.pyi +++ /dev/null @@ -1,7 +0,0 @@ -from setuptools.dist import Distribution - -from .._distutils.command import upload as orig - -class upload(orig.upload): - distribution: Distribution # override distutils.dist.Distribution with setuptools.dist.Distribution - def run(self) -> None: ... diff --git a/stubs/setuptools/setuptools/command/upload_docs.pyi b/stubs/setuptools/setuptools/command/upload_docs.pyi deleted file mode 100644 index 3e75d483e..000000000 --- a/stubs/setuptools/setuptools/command/upload_docs.pyi +++ /dev/null @@ -1,21 +0,0 @@ -from _typeshed import Incomplete -from collections.abc import Callable -from typing import Any, ClassVar - -from .upload import upload - -class upload_docs(upload): - DEFAULT_REPOSITORY: ClassVar[str] - description: ClassVar[str] - user_options: ClassVar[list[tuple[str, str | None, str]]] - boolean_options = upload.boolean_options - def has_sphinx(self): ... - # Any to work around variance issues - sub_commands: ClassVar[list[tuple[str, Callable[[Any], bool] | None]]] - upload_dir: Incomplete - target_dir: Incomplete - def initialize_options(self) -> None: ... - def finalize_options(self) -> None: ... - def create_zipfile(self, filename) -> None: ... - def run(self) -> None: ... - def upload_file(self, filename) -> None: ... # type: ignore[override] diff --git a/stubs/setuptools/setuptools/dist.pyi b/stubs/setuptools/setuptools/dist.pyi index ed8ef092b..cbe36414d 100644 --- a/stubs/setuptools/setuptools/dist.pyi +++ b/stubs/setuptools/setuptools/dist.pyi @@ -21,13 +21,10 @@ from .command.install import install from .command.install_egg_info import install_egg_info from .command.install_lib import install_lib from .command.install_scripts import install_scripts -from .command.register import register from .command.rotate import rotate from .command.saveopts import saveopts from .command.sdist import sdist from .command.setopt import setopt -from .command.upload import upload -from .command.upload_docs import upload_docs _CommandT = TypeVar("_CommandT", bound=Command) @@ -83,8 +80,6 @@ class Distribution(_Distribution): @overload def get_command_obj(self, command: Literal["install_scripts"], create: Literal[1, True] = 1) -> install_scripts: ... # type: ignore[overload-overlap] @overload - def get_command_obj(self, command: Literal["register"], create: Literal[1, True] = 1) -> register: ... # type: ignore[overload-overlap] - @overload def get_command_obj(self, command: Literal["rotate"], create: Literal[1, True] = 1) -> rotate: ... @overload def get_command_obj(self, command: Literal["saveopts"], create: Literal[1, True] = 1) -> saveopts: ... @@ -93,10 +88,6 @@ class Distribution(_Distribution): @overload def get_command_obj(self, command: Literal["setopt"], create: Literal[1, True] = 1) -> setopt: ... @overload - def get_command_obj(self, command: Literal["upload"], create: Literal[1, True] = 1) -> upload: ... # type: ignore[overload-overlap] - @overload - def get_command_obj(self, command: Literal["upload_docs"], create: Literal[1, True] = 1) -> upload_docs: ... # type: ignore[overload-overlap] - @overload def get_command_obj(self, command: str, create: Literal[1, True] = 1) -> Command: ... # Not replicating the overloads for "Command | None", user may use "isinstance" @overload @@ -136,8 +127,6 @@ class Distribution(_Distribution): @overload def get_command_class(self, command: Literal["install_scripts"]) -> type[install_scripts]: ... # type: ignore[overload-overlap] @overload - def get_command_class(self, command: Literal["register"]) -> type[register]: ... # type: ignore[overload-overlap] - @overload def get_command_class(self, command: Literal["rotate"]) -> type[rotate]: ... @overload def get_command_class(self, command: Literal["saveopts"]) -> type[saveopts]: ... @@ -146,10 +135,6 @@ class Distribution(_Distribution): @overload def get_command_class(self, command: Literal["setopt"]) -> type[setopt]: ... @overload - def get_command_class(self, command: Literal["upload"]) -> type[upload]: ... # type: ignore[overload-overlap] - @overload - def get_command_class(self, command: Literal["upload_docs"]) -> type[upload_docs]: ... # type: ignore[overload-overlap] - @overload def get_command_class(self, command: str) -> type[Command]: ... @overload # type: ignore[override] def reinitialize_command(self, command: Literal["alias"], reinit_subcommands: bool = False) -> alias: ... @@ -188,8 +173,6 @@ class Distribution(_Distribution): @overload def reinitialize_command(self, command: Literal["install_scripts"], reinit_subcommands: bool = False) -> install_scripts: ... # type: ignore[overload-overlap] @overload - def reinitialize_command(self, command: Literal["register"], reinit_subcommands: bool = False) -> register: ... # type: ignore[overload-overlap] - @overload def reinitialize_command(self, command: Literal["rotate"], reinit_subcommands: bool = False) -> rotate: ... @overload def reinitialize_command(self, command: Literal["saveopts"], reinit_subcommands: bool = False) -> saveopts: ... @@ -198,10 +181,6 @@ class Distribution(_Distribution): @overload def reinitialize_command(self, command: Literal["setopt"], reinit_subcommands: bool = False) -> setopt: ... @overload - def reinitialize_command(self, command: Literal["upload"], reinit_subcommands: bool = False) -> upload: ... # type: ignore[overload-overlap] - @overload - def reinitialize_command(self, command: Literal["upload_docs"], reinit_subcommands: bool = False) -> upload_docs: ... # type: ignore[overload-overlap] - @overload def reinitialize_command(self, command: str, reinit_subcommands: bool = False) -> Command: ... @overload def reinitialize_command(self, command: _CommandT, reinit_subcommands: bool = False) -> _CommandT: ...