Skip to content

Commit

Permalink
[setuptools] Bump to 75.0.* (#12668)
Browse files Browse the repository at this point in the history
Co-authored-by: Avasam <[email protected]>
  • Loading branch information
srittau and Avasam authored Sep 16, 2024
1 parent 2e9a61f commit 9488989
Show file tree
Hide file tree
Showing 18 changed files with 84 additions and 174 deletions.
15 changes: 1 addition & 14 deletions stubs/setuptools/@tests/stubtest_allowlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions stubs/setuptools/@tests/test_cases/check_distutils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import distutils.command.sdist
import distutils.config

d = distutils.config.PyPIRCCommand
c = distutils.command.sdist.sdist
2 changes: 1 addition & 1 deletion stubs/setuptools/METADATA.toml
Original file line number Diff line number Diff line change
@@ -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`,
Expand Down
39 changes: 39 additions & 0 deletions stubs/setuptools/distutils/command/__init__.pyi
Original file line number Diff line number Diff line change
@@ -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",
]
1 change: 0 additions & 1 deletion stubs/setuptools/distutils/command/register.pyi

This file was deleted.

1 change: 0 additions & 1 deletion stubs/setuptools/distutils/command/upload.pyi

This file was deleted.

1 change: 0 additions & 1 deletion stubs/setuptools/distutils/config.pyi

This file was deleted.

15 changes: 0 additions & 15 deletions stubs/setuptools/setuptools/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: ...
Expand All @@ -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: ...
Expand Down Expand Up @@ -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: ...
Expand All @@ -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: ...
Expand Down
8 changes: 4 additions & 4 deletions stubs/setuptools/setuptools/_distutils/archive_util.pyi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from _typeshed import StrOrBytesPath, StrPath
from typing import overload
from typing import Literal, overload

@overload
def make_archive(
Expand All @@ -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: ...
39 changes: 39 additions & 0 deletions stubs/setuptools/setuptools/_distutils/command/__init__.pyi
Original file line number Diff line number Diff line change
@@ -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",
]
30 changes: 0 additions & 30 deletions stubs/setuptools/setuptools/_distutils/command/register.pyi

This file was deleted.

3 changes: 0 additions & 3 deletions stubs/setuptools/setuptools/_distutils/command/sdist.pyi
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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: ...
Expand Down
30 changes: 0 additions & 30 deletions stubs/setuptools/setuptools/_distutils/command/upload.pyi

This file was deleted.

16 changes: 0 additions & 16 deletions stubs/setuptools/setuptools/_distutils/config.pyi

This file was deleted.

7 changes: 0 additions & 7 deletions stubs/setuptools/setuptools/command/register.pyi

This file was deleted.

7 changes: 0 additions & 7 deletions stubs/setuptools/setuptools/command/upload.pyi

This file was deleted.

21 changes: 0 additions & 21 deletions stubs/setuptools/setuptools/command/upload_docs.pyi

This file was deleted.

Loading

0 comments on commit 9488989

Please sign in to comment.