From d436110d1361ec82ae3971ed10d94c0090647b63 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Sat, 16 Mar 2024 16:44:47 +0000 Subject: [PATCH] Add `distutils` as a top-level package included with `types-setuptools` (#10948) --- .../setuptools/@tests/stubtest_allowlist.txt | 96 ++++++++++++++++++- .../@tests/test_cases/check_distutils.py | 5 + stubs/setuptools/distutils/archive_util.pyi | 1 + stubs/setuptools/distutils/ccompiler.pyi | 1 + stubs/setuptools/distutils/cmd.pyi | 1 + .../distutils/command/bdist_rpm.pyi | 1 + stubs/setuptools/distutils/command/build.pyi | 1 + .../distutils/command/build_clib.pyi | 1 + .../distutils/command/build_ext.pyi | 1 + .../setuptools/distutils/command/build_py.pyi | 1 + .../setuptools/distutils/command/install.pyi | 1 + .../distutils/command/install_scripts.pyi | 1 + .../setuptools/distutils/command/register.pyi | 1 + stubs/setuptools/distutils/command/sdist.pyi | 1 + stubs/setuptools/distutils/command/upload.pyi | 1 + stubs/setuptools/distutils/config.pyi | 1 + stubs/setuptools/distutils/dep_util.pyi | 1 + stubs/setuptools/distutils/dist.pyi | 1 + stubs/setuptools/distutils/errors.pyi | 1 + stubs/setuptools/distutils/extension.pyi | 1 + stubs/setuptools/distutils/filelist.pyi | 1 + stubs/setuptools/distutils/sysconfig.pyi | 1 + stubs/setuptools/distutils/util.pyi | 1 + 23 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 stubs/setuptools/@tests/test_cases/check_distutils.py create mode 100644 stubs/setuptools/distutils/archive_util.pyi create mode 100644 stubs/setuptools/distutils/ccompiler.pyi create mode 100644 stubs/setuptools/distutils/cmd.pyi create mode 100644 stubs/setuptools/distutils/command/bdist_rpm.pyi create mode 100644 stubs/setuptools/distutils/command/build.pyi create mode 100644 stubs/setuptools/distutils/command/build_clib.pyi create mode 100644 stubs/setuptools/distutils/command/build_ext.pyi create mode 100644 stubs/setuptools/distutils/command/build_py.pyi create mode 100644 stubs/setuptools/distutils/command/install.pyi create mode 100644 stubs/setuptools/distutils/command/install_scripts.pyi create mode 100644 stubs/setuptools/distutils/command/register.pyi create mode 100644 stubs/setuptools/distutils/command/sdist.pyi create mode 100644 stubs/setuptools/distutils/command/upload.pyi create mode 100644 stubs/setuptools/distutils/config.pyi create mode 100644 stubs/setuptools/distutils/dep_util.pyi create mode 100644 stubs/setuptools/distutils/dist.pyi create mode 100644 stubs/setuptools/distutils/errors.pyi create mode 100644 stubs/setuptools/distutils/extension.pyi create mode 100644 stubs/setuptools/distutils/filelist.pyi create mode 100644 stubs/setuptools/distutils/sysconfig.pyi create mode 100644 stubs/setuptools/distutils/util.pyi diff --git a/stubs/setuptools/@tests/stubtest_allowlist.txt b/stubs/setuptools/@tests/stubtest_allowlist.txt index 8203636ed..1ab28e6f7 100644 --- a/stubs/setuptools/@tests/stubtest_allowlist.txt +++ b/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.* diff --git a/stubs/setuptools/@tests/test_cases/check_distutils.py b/stubs/setuptools/@tests/test_cases/check_distutils.py new file mode 100644 index 000000000..6cf41dc7c --- /dev/null +++ b/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 diff --git a/stubs/setuptools/distutils/archive_util.pyi b/stubs/setuptools/distutils/archive_util.pyi new file mode 100644 index 000000000..115f30506 --- /dev/null +++ b/stubs/setuptools/distutils/archive_util.pyi @@ -0,0 +1 @@ +from setuptools._distutils.archive_util import * diff --git a/stubs/setuptools/distutils/ccompiler.pyi b/stubs/setuptools/distutils/ccompiler.pyi new file mode 100644 index 000000000..e1770cfdf --- /dev/null +++ b/stubs/setuptools/distutils/ccompiler.pyi @@ -0,0 +1 @@ +from setuptools._distutils.ccompiler import * diff --git a/stubs/setuptools/distutils/cmd.pyi b/stubs/setuptools/distutils/cmd.pyi new file mode 100644 index 000000000..235ca5680 --- /dev/null +++ b/stubs/setuptools/distutils/cmd.pyi @@ -0,0 +1 @@ +from setuptools._distutils.cmd import * diff --git a/stubs/setuptools/distutils/command/bdist_rpm.pyi b/stubs/setuptools/distutils/command/bdist_rpm.pyi new file mode 100644 index 000000000..32e88d493 --- /dev/null +++ b/stubs/setuptools/distutils/command/bdist_rpm.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.bdist_rpm import * diff --git a/stubs/setuptools/distutils/command/build.pyi b/stubs/setuptools/distutils/command/build.pyi new file mode 100644 index 000000000..1fe7d1e73 --- /dev/null +++ b/stubs/setuptools/distutils/command/build.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.build import * diff --git a/stubs/setuptools/distutils/command/build_clib.pyi b/stubs/setuptools/distutils/command/build_clib.pyi new file mode 100644 index 000000000..f60f41aa8 --- /dev/null +++ b/stubs/setuptools/distutils/command/build_clib.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.build_clib import * diff --git a/stubs/setuptools/distutils/command/build_ext.pyi b/stubs/setuptools/distutils/command/build_ext.pyi new file mode 100644 index 000000000..c19671568 --- /dev/null +++ b/stubs/setuptools/distutils/command/build_ext.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.build_ext import * diff --git a/stubs/setuptools/distutils/command/build_py.pyi b/stubs/setuptools/distutils/command/build_py.pyi new file mode 100644 index 000000000..0d97b743f --- /dev/null +++ b/stubs/setuptools/distutils/command/build_py.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.build_py import * diff --git a/stubs/setuptools/distutils/command/install.pyi b/stubs/setuptools/distutils/command/install.pyi new file mode 100644 index 000000000..6ef0aca09 --- /dev/null +++ b/stubs/setuptools/distutils/command/install.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.install import * diff --git a/stubs/setuptools/distutils/command/install_scripts.pyi b/stubs/setuptools/distutils/command/install_scripts.pyi new file mode 100644 index 000000000..3cebd5543 --- /dev/null +++ b/stubs/setuptools/distutils/command/install_scripts.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.install_scripts import * diff --git a/stubs/setuptools/distutils/command/register.pyi b/stubs/setuptools/distutils/command/register.pyi new file mode 100644 index 000000000..83d12de0f --- /dev/null +++ b/stubs/setuptools/distutils/command/register.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.register import * diff --git a/stubs/setuptools/distutils/command/sdist.pyi b/stubs/setuptools/distutils/command/sdist.pyi new file mode 100644 index 000000000..50a819163 --- /dev/null +++ b/stubs/setuptools/distutils/command/sdist.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.sdist import * diff --git a/stubs/setuptools/distutils/command/upload.pyi b/stubs/setuptools/distutils/command/upload.pyi new file mode 100644 index 000000000..640d7bf91 --- /dev/null +++ b/stubs/setuptools/distutils/command/upload.pyi @@ -0,0 +1 @@ +from setuptools._distutils.command.upload import * diff --git a/stubs/setuptools/distutils/config.pyi b/stubs/setuptools/distutils/config.pyi new file mode 100644 index 000000000..ebd367c2d --- /dev/null +++ b/stubs/setuptools/distutils/config.pyi @@ -0,0 +1 @@ +from setuptools._distutils.config import * diff --git a/stubs/setuptools/distutils/dep_util.pyi b/stubs/setuptools/distutils/dep_util.pyi new file mode 100644 index 000000000..22008d8cf --- /dev/null +++ b/stubs/setuptools/distutils/dep_util.pyi @@ -0,0 +1 @@ +from setuptools._distutils.dep_util import * diff --git a/stubs/setuptools/distutils/dist.pyi b/stubs/setuptools/distutils/dist.pyi new file mode 100644 index 000000000..b6cdf2bd9 --- /dev/null +++ b/stubs/setuptools/distutils/dist.pyi @@ -0,0 +1 @@ +from setuptools._distutils.dist import * diff --git a/stubs/setuptools/distutils/errors.pyi b/stubs/setuptools/distutils/errors.pyi new file mode 100644 index 000000000..28a21bf13 --- /dev/null +++ b/stubs/setuptools/distutils/errors.pyi @@ -0,0 +1 @@ +from setuptools._distutils.errors import * diff --git a/stubs/setuptools/distutils/extension.pyi b/stubs/setuptools/distutils/extension.pyi new file mode 100644 index 000000000..95b5cf764 --- /dev/null +++ b/stubs/setuptools/distutils/extension.pyi @@ -0,0 +1 @@ +from setuptools._distutils.extension import * diff --git a/stubs/setuptools/distutils/filelist.pyi b/stubs/setuptools/distutils/filelist.pyi new file mode 100644 index 000000000..fe746bbdc --- /dev/null +++ b/stubs/setuptools/distutils/filelist.pyi @@ -0,0 +1 @@ +from setuptools._distutils.filelist import * diff --git a/stubs/setuptools/distutils/sysconfig.pyi b/stubs/setuptools/distutils/sysconfig.pyi new file mode 100644 index 000000000..9b50b4987 --- /dev/null +++ b/stubs/setuptools/distutils/sysconfig.pyi @@ -0,0 +1 @@ +from setuptools._distutils.sysconfig import * diff --git a/stubs/setuptools/distutils/util.pyi b/stubs/setuptools/distutils/util.pyi new file mode 100644 index 000000000..b5723b79d --- /dev/null +++ b/stubs/setuptools/distutils/util.pyi @@ -0,0 +1 @@ +from setuptools._distutils.util import *