Add distutils as a top-level package included with types-setuptools

stubs/setuptools/@tests/stubtest_allowlist.txt

@@ -29,9 +29,103 @@ 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.ccompiler.CCompiler.EXECUTABLE
+setuptools._distutils.ccompiler.CCompiler.SHARED_LIBRARY
+setuptools._distutils.ccompiler.CCompiler.SHARED_OBJECT
+setuptools._distutils.ccompiler.CCompiler.compiler_type
+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.sdist.show_formats
+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
+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.bcppcompiler
+setuptools._distutils.command.bdist
+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_data
+setuptools._distutils.command.install_egg_info
+setuptools._distutils.command.install_headers
+setuptools._distutils.command.py37compat
+setuptools._distutils.core
+setuptools._distutils.cygwinccompiler
+setuptools._distutils.debug
+setuptools._distutils.dir_util
+setuptools._distutils.fancy_getopt
+setuptools._distutils.file_util
+setuptools._distutils.log
+setuptools._distutils.msvc9compiler
+setuptools._distutils.msvccompiler
+setuptools._distutils.py38compat
+setuptools._distutils.py39compat
+setuptools._distutils.spawn
+setuptools._distutils.text_file
+setuptools._distutils.unixccompiler
+setuptools._distutils.version
+setuptools._distutils.versionpredicate
+
+# Reexported from setuptools._distutils; problems should be fixed there
+distutils\..+
+
 # Is a functools.partial, so stubtest says "is not a function"
 setuptools.dep_util.newer_pairwise_group
+setuptools._distutils.dep_util.newer_pairwise
 setuptools.modified.newer_pairwise_group
+setuptools._distutils._modified.newer_pairwise_group
 
 # Private modules
 setuptools.config._validate_pyproject.*
@@ -40,8 +134,6 @@ setuptools.command.build_py.build_py.existing_egg_info_dir
 # Loop variable leak
 setuptools.sandbox.AbstractSandbox.name
 
-# Vendored and modified version of stdlib's distutils. Basically implementation details
-setuptools._distutils.*
 # Other vendored code
 setuptools._vendor.*
 pkg_resources._vendor.*

stubs/setuptools/@tests/test_cases/check_distutils.py

@@ -0,0 +1,5 @@
+import distutils.command.sdist
+import distutils.config
+
+d = distutils.config.PyPIRCCommand
+c = distutils.command.sdist.sdist

stubs/setuptools/distutils/archive_util.pyi

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

stubs/setuptools/distutils/ccompiler.pyi

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

stubs/setuptools/distutils/cmd.pyi

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

stubs/setuptools/distutils/command/bdist_rpm.pyi

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

stubs/setuptools/distutils/command/build.pyi

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

stubs/setuptools/distutils/command/build_clib.pyi

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

stubs/setuptools/distutils/command/build_ext.pyi

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

stubs/setuptools/distutils/command/build_py.pyi

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

stubs/setuptools/distutils/command/install.pyi

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

stubs/setuptools/distutils/command/install_scripts.pyi

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

stubs/setuptools/distutils/command/register.pyi

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

stubs/setuptools/distutils/command/sdist.pyi

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

stubs/setuptools/distutils/command/upload.pyi

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

stubs/setuptools/distutils/config.pyi

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

stubs/setuptools/distutils/dep_util.pyi

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

stubs/setuptools/distutils/dist.pyi

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

stubs/setuptools/distutils/errors.pyi

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

stubs/setuptools/distutils/extension.pyi

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

stubs/setuptools/distutils/filelist.pyi

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

stubs/setuptools/distutils/sysconfig.pyi

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

stubs/setuptools/distutils/util.pyi

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

tests/stubtest_third_party.py

@@ -4,10 +4,13 @@
 from __future__ import annotations
 
 import argparse
+import contextlib
 import os
+import shutil
 import subprocess
 import sys
 import tempfile
+from collections.abc import Iterator
 from pathlib import Path
 from textwrap import dedent
 from typing import NoReturn
@@ -16,10 +19,23 @@
 from utils import PYTHON_VERSION, colored, get_mypy_req, print_error, print_success_msg
 
 
+@contextlib.contextmanager
+def temporarily_delete_stdlib_distutils(typeshed_dir: Path) -> Iterator[None]:
+    stdlib_distutils_dir = typeshed_dir / "stdlib" / "distutils"
+    with tempfile.TemporaryDirectory() as td:
+        shutil.copytree(stdlib_distutils_dir, td, dirs_exist_ok=True)
+        try:
+            shutil.rmtree(stdlib_distutils_dir)
+            yield
+        finally:
+            shutil.copytree(td, stdlib_distutils_dir, dirs_exist_ok=True)
+
+
 def run_stubtest(
     dist: Path, *, parser: argparse.ArgumentParser, verbose: bool = False, specified_platforms_only: bool = False
 ) -> bool:
     dist_name = dist.name
+    typeshed_dir = dist.parent.parent
     try:
         metadata = read_metadata(dist_name)
     except NoSuchStubError as e:
@@ -41,8 +57,8 @@ def run_stubtest(
         print(colored(f"skipping (requires Python {metadata.requires_python})", "yellow"))
         return True
 
-    with tempfile.TemporaryDirectory() as tmp:
-        venv_dir = Path(tmp)
+    with contextlib.ExitStack() as stack:
+        venv_dir = Path(stack.enter_context(tempfile.TemporaryDirectory()))
         try:
             subprocess.run(["uv", "venv", venv_dir, "--seed"], capture_output=True, check=True)
         except subprocess.CalledProcessError as e:
@@ -89,7 +105,7 @@ def run_stubtest(
             "mypy.stubtest",
             # Use --custom-typeshed-dir in case we make linked changes to stdlib or _typeshed
             "--custom-typeshed-dir",
-            str(dist.parent.parent),
+            str(typeshed_dir),
             *ignore_missing_stub,
             *packages_to_check,
             *modules_to_check,
@@ -117,6 +133,10 @@ def run_stubtest(
         if dist_name == "uWSGI":
             if not setup_uwsgi_stubtest_command(dist, venv_dir, stubtest_cmd):
                 return False
+        # setuptools also requires special-casing, or stubtest gets confused
+        # between stdlib-distutils and setuptools-distutils
+        elif dist_name == "setuptools":
+            stack.enter_context(temporarily_delete_stdlib_distutils(typeshed_dir))
 
         try:
             subprocess.run(stubtest_cmd, env=stubtest_env, check=True, capture_output=True)
@@ -147,8 +167,8 @@ def run_stubtest(
         else:
             print_success_msg()
 
-    if verbose:
-        print_commands(dist, pip_cmd, stubtest_cmd, mypypath)
+        if verbose:
+            print_commands(dist, pip_cmd, stubtest_cmd, mypypath)
 
     return True