Remove most of setuptools._distutils

stubs/setuptools/@tests/stubtest_allowlist.txt

@@ -23,13 +23,19 @@ pkg_resources.declare_namespace
 pkg_resources.fixup_namespace_packages
 pkg_resources.get_entry_map
 pkg_resources.get_provider
-pkg_resources.py31compat
 pkg_resources.split_sections
 pkg_resources.to_filename
 
-# Only present if docutils is installed
-setuptools._distutils.command.check.SilentReporter
+# Uncomment once ignore_missing_stub is turned off
+# # Not supported by typeshed
+# setuptools.py34compat
 
-# Discrepancy in the value of the default
-# between setuptools's version of distutils and the stdlib distutils
-setuptools._distutils.core.Command.announce
+# # Private modules
+# setuptools.config._validate_pyproject.*
+# setuptools.build_meta._BuildMetaBackend.*
+
+# # Vendored and modified version of stdlib's distutils. Basically implementation details
+# setuptools._distutils.*
+# # Other vendored code
+# setuptools._vendor.*
+# pkg_resources._vendor.*

stubs/setuptools/METADATA.toml

@@ -1,5 +1,13 @@
 version = "67.4.*"
-requires = ["types-docutils"]
+extra_description = """\
+Having [setuptools](https://pypi.org/project/setuptools/) installed results in incorrect \
+[distutils](https://docs.python.org/3/distutils/introduction.html) typing. \
+`types-setuptools` makes no attempt at correcting this issue. As of \
+`setuptools>=60.0.0`, you [should not be using `distutils` directly](\
+https://setuptools.pypa.io/en/latest/deprecated/distutils-legacy.html). \
+`distutils` is deprecated as of Python 3.10 and will be fully removed in Python 3.12. \
+(see [PEP 632](https://peps.python.org/pep-0632/))
+"""
 
 [tool.stubtest]
 ignore_missing_stub = true

stubs/setuptools/setuptools/__init__.pyi

@@ -1,13 +1,14 @@
 from abc import abstractmethod
 from collections.abc import Iterable, Mapping, Sequence
-from distutils.core import Command as _Command
 from typing import Any
 
 from setuptools._deprecation_warning import SetuptoolsDeprecationWarning as SetuptoolsDeprecationWarning
 from setuptools.depends import Require as Require
 from setuptools.dist import Distribution as Distribution
 from setuptools.extension import Extension as Extension
 
+from ._distutils.cmd import Command as _Command
+
 __version__: str
 
 class PackageFinder:

stubs/setuptools/setuptools/_distutils/cmd.pyi

@@ -1,7 +1,8 @@
+from _typeshed import Incomplete
 from abc import abstractmethod
 from collections.abc import Callable, Iterable
-from distutils.dist import Distribution
-from typing import Any
+
+from .dist import Distribution
 
 class Command:
     sub_commands: list[tuple[str, Callable[[Command], bool] | None]]
@@ -25,7 +26,9 @@ class Command:
     def run_command(self, command: str) -> None: ...
     def get_sub_commands(self) -> list[str]: ...
     def warn(self, msg: str) -> None: ...
-    def execute(self, func: Callable[..., object], args: Iterable[Any], msg: str | None = ..., level: int = ...) -> None: ...
+    def execute(
+        self, func: Callable[..., object], args: Iterable[Incomplete], msg: str | None = ..., level: int = ...
+    ) -> None: ...
     def mkpath(self, name: str, mode: int = ...) -> None: ...
     def copy_file(
         self,
@@ -34,7 +37,7 @@ class Command:
         preserve_mode: int = ...,
         preserve_times: int = ...,
         link: str | None = ...,
-        level: Any = ...,
+        level: int = ...,
     ) -> tuple[str, bool]: ...  # level is not used
     def copy_tree(
         self,
@@ -43,10 +46,10 @@ class Command:
         preserve_mode: int = ...,
         preserve_times: int = ...,
         preserve_symlinks: int = ...,
-        level: Any = ...,
+        level: int = ...,
     ) -> list[str]: ...  # level is not used
-    def move_file(self, src: str, dst: str, level: Any = ...) -> str: ...  # level is not used
-    def spawn(self, cmd: Iterable[str], search_path: int = ..., level: Any = ...) -> None: ...  # level is not used
+    def move_file(self, src: str, dst: str, level: int = ...) -> str: ...  # level is not used
+    def spawn(self, cmd: Iterable[str], search_path: int = ..., level: int = ...) -> None: ...  # level is not used
     def make_archive(
         self,
         base_name: str,
@@ -61,8 +64,8 @@ class Command:
         infiles: str | list[str] | tuple[str, ...],
         outfile: str,
         func: Callable[..., object],
-        args: list[Any],
+        args: list[Incomplete],
         exec_msg: str | None = ...,
         skip_msg: str | None = ...,
-        level: Any = ...,
+        level: int = ...,
     ) -> None: ...  # level is not used