Removing (now typed) setuptools._distutils

stubs/setuptools/@tests/stubtest_allowlist.txt

@@ -1,88 +1,26 @@
-# Is a functools.partial, so stubtest says "is not a function"
-setuptools._distutils._modified.newer_pairwise_group
-
-# Runtime initializes to None, but this really should never be None when used
-setuptools._distutils.compilers.C.base.Compiler.compiler_type
-
-# Dynamically created in __init__
-setuptools._distutils.dist.Distribution.get_name
-setuptools._distutils.dist.Distribution.get_version
-setuptools._distutils.dist.Distribution.get_fullname
-setuptools._distutils.dist.Distribution.get_author
-setuptools._distutils.dist.Distribution.get_author_email
-setuptools._distutils.dist.Distribution.get_maintainer
-setuptools._distutils.dist.Distribution.get_maintainer_email
-setuptools._distutils.dist.Distribution.get_contact
-setuptools._distutils.dist.Distribution.get_contact_email
-setuptools._distutils.dist.Distribution.get_url
-setuptools._distutils.dist.Distribution.get_license
-setuptools._distutils.dist.Distribution.get_licence
-setuptools._distutils.dist.Distribution.get_description
-setuptools._distutils.dist.Distribution.get_long_description
-setuptools._distutils.dist.Distribution.get_keywords
-setuptools._distutils.dist.Distribution.get_platforms
-setuptools._distutils.dist.Distribution.get_classifiers
-setuptools._distutils.dist.Distribution.get_download_url
-setuptools._distutils.dist.Distribution.get_requires
-setuptools._distutils.dist.Distribution.get_provides
-setuptools._distutils.dist.Distribution.get_obsoletes
-
-# Missing objects from setuptools._distutils
-setuptools._distutils.archive_util.ARCHIVE_FORMATS
-setuptools._distutils.archive_util.check_archive_formats
-setuptools._distutils.cmd.Command.dump_options
-setuptools._distutils.command.build_ext.extension_name_re
-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.dir_util.SkipRepeatAbsolutePaths.instance
-setuptools._distutils.dist.fix_help_options
-setuptools._distutils.extension.read_setup_file
-setuptools._distutils.filelist.findall
-setuptools._distutils.filelist.glob_to_re
-setuptools._distutils.filelist.translate_pattern
-setuptools._distutils.sysconfig.BASE_EXEC_PREFIX
-setuptools._distutils.sysconfig.BASE_PREFIX
-setuptools._distutils.sysconfig.IS_PYPY
-setuptools._distutils.sysconfig.build_flags
-setuptools._distutils.sysconfig.expand_makefile_vars
-setuptools._distutils.sysconfig.get_python_version
-setuptools._distutils.sysconfig.parse_config_h
-setuptools._distutils.sysconfig.parse_makefile
-setuptools._distutils.sysconfig.project_base
-setuptools._distutils.sysconfig.python_build
-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.command.__all__
-setuptools._distutils.command.bdist_dumb
-setuptools._distutils.command.build_scripts
-setuptools._distutils.command.check
-setuptools._distutils.command.clean
-setuptools._distutils.command.config
-setuptools._distutils.command.install_egg_info
-setuptools._distutils.command.install_headers
-setuptools._distutils.compat.numpy
-setuptools._distutils.compat.py39
-setuptools._distutils.core
-setuptools._distutils.debug
-setuptools._distutils.fancy_getopt
-setuptools._distutils.log
-setuptools._distutils.text_file
-setuptools._distutils.version.Version._cmp # abstract method
-setuptools._distutils.version.Version.parse # abstract method
-setuptools._distutils.version.suppress_known_deprecation
-setuptools._distutils.versionpredicate
-
-# Reexported from setuptools._distutils; problems should be fixed there
+# Reexported from https://github.com/pypa/distutils; problems should be fixed there
 distutils\..+
+setuptools._distutils\..+
 
 # Private APIs, tests and other vendored code
 setuptools.config._validate_pyproject.*
 setuptools.compat.*
-setuptools.command.build_py.build_py.existing_egg_info_dir
 .+?\.tests.*
+
+# stubtest fails on implicit submodule imports for __all__ (in setuptools/_distutils/command/__init__.py)
+# An attempt at a fix was done in https://github.com/pypa/distutils/pull/345,
+# but that caused more issues with setuptools' monkeypatching, see conversation in
+# https://github.com/pypa/setuptools/issues/4902#issuecomment-2741298642
+setuptools.command.bdist_rpm
+setuptools.command.bdist_wheel
+setuptools.command.build_clib
+setuptools.command.build_py
+setuptools.command.dist_info
+setuptools.command.editable_wheel
+setuptools.command.egg_info
+setuptools.command.install
+setuptools.command.install_lib
+setuptools.command.install_scripts
+setuptools.command.sdist
+setuptools.installer
+setuptools.wheel

stubs/setuptools/METADATA.toml

@@ -4,6 +4,10 @@ extra-description = """\
 Given that `pkg_resources` is typed since `setuptools >= 71.1`, \
 it is no longer included with `types-setuptools`.
 """
+dependencies = ["setuptools>=83"] # For setuptools._distutils
+# setuptools/_distutils is a vendor of pypa's distutils. Which is now as typed.
+# Type-checkers should not skip it just because `types-setuptools` is installed.
+partial-stub = true
 
 [tool.stubtest]
 # darwin is equivalent to linux for OS-specific methods

stubs/setuptools/distutils/command/bdist_dumb.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.command.bdist_dumb import *

stubs/setuptools/distutils/command/build_scripts.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.command.build_scripts import *

stubs/setuptools/distutils/command/check.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.command.check import *

stubs/setuptools/distutils/command/clean.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.command.clean import *

stubs/setuptools/distutils/command/config.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.command.config import *

stubs/setuptools/distutils/command/install_egg_info.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.command.install_egg_info import *

stubs/setuptools/distutils/command/install_headers.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.command.install_headers import *

stubs/setuptools/distutils/core.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.core import *

stubs/setuptools/distutils/debug.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.debug import *

stubs/setuptools/distutils/dir_util.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.dir_util import *

stubs/setuptools/distutils/fancy_getopt.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.fancy_getopt import *

stubs/setuptools/distutils/file_util.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.file_util import *

stubs/setuptools/distutils/log.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.log import *

stubs/setuptools/distutils/text_file.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.text_file import *

stubs/setuptools/distutils/versionpredicate.pyi

@@ -0,0 +1 @@
+from setuptools._distutils.versionpredicate import *

stubs/setuptools/setuptools/__init__.pyi

@@ -4,9 +4,10 @@ from collections.abc import ItemsView, Iterable, Mapping, Sequence
 from typing import Any, Literal, Protocol, TypedDict, TypeVar, overload, type_check_only
 from typing_extensions import Never, NotRequired
 
-from ._distutils.cmd import Command as _Command
-from ._distutils.dist import Distribution as _Distribution
-from ._distutils.extension import Extension as _Extension
+from setuptools._distutils.cmd import Command as _Command
+from setuptools._distutils.dist import Distribution as _Distribution
+from setuptools._distutils.extension import Extension as _Extension
+
 from .command.alias import alias
 from .command.bdist_egg import bdist_egg
 from .command.bdist_rpm import bdist_rpm