Merge pull request #2226 from pypa/distutils-nested

Move distutils to setuptools._distutils

Merge pull request #2226 from pypa/distutils-nested
Move distutils to setuptools._distutils
2daf7f68 · Jason R. Coombs · GitHub · c486771a · 97192962 · 2daf7f68
Commit 2daf7f68 authored Jul 03, 2020 by Jason R. Coombs Committed by GitHub Jul 03, 2020
111 changed files
--- a/conftest.py
+++ b/conftest.py
@@ -14,7 +14,7 @@ def pytest_addoption(parser):
 collect_ignore = [
    'tests/manual_test.py',
    'setuptools/tests/mod_with_constant.py',
-    'distutils',
+    'setuptools/_distutils',
 ]



--- a/distutils/README
+++ b/distutils/README
--- a/distutils/__init__.py
+++ b/distutils/__init__.py
--- a/distutils/_msvccompiler.py
+++ b/distutils/_msvccompiler.py
--- a/distutils/archive_util.py
+++ b/distutils/archive_util.py
--- a/distutils/bcppcompiler.py
+++ b/distutils/bcppcompiler.py
--- a/distutils/ccompiler.py
+++ b/distutils/ccompiler.py
--- a/distutils/cmd.py
+++ b/distutils/cmd.py
--- a/distutils/command/__init__.py
+++ b/distutils/command/__init__.py
--- a/distutils/command/bdist.py
+++ b/distutils/command/bdist.py
--- a/distutils/command/bdist_dumb.py
+++ b/distutils/command/bdist_dumb.py
--- a/distutils/command/bdist_msi.py
+++ b/distutils/command/bdist_msi.py
--- a/distutils/command/bdist_rpm.py
+++ b/distutils/command/bdist_rpm.py
--- a/distutils/command/bdist_wininst.py
+++ b/distutils/command/bdist_wininst.py
--- a/distutils/command/build.py
+++ b/distutils/command/build.py
--- a/distutils/command/build_clib.py
+++ b/distutils/command/build_clib.py
--- a/distutils/command/build_ext.py
+++ b/distutils/command/build_ext.py
--- a/distutils/command/build_py.py
+++ b/distutils/command/build_py.py
--- a/distutils/command/build_scripts.py
+++ b/distutils/command/build_scripts.py
--- a/distutils/command/check.py
+++ b/distutils/command/check.py
--- a/distutils/command/clean.py
+++ b/distutils/command/clean.py
--- a/distutils/command/command_template
+++ b/distutils/command/command_template
--- a/distutils/command/config.py
+++ b/distutils/command/config.py
--- a/distutils/command/install.py
+++ b/distutils/command/install.py
--- a/distutils/command/install_data.py
+++ b/distutils/command/install_data.py
--- a/distutils/command/install_egg_info.py
+++ b/distutils/command/install_egg_info.py
--- a/distutils/command/install_headers.py
+++ b/distutils/command/install_headers.py
--- a/distutils/command/install_lib.py
+++ b/distutils/command/install_lib.py
--- a/distutils/command/install_scripts.py
+++ b/distutils/command/install_scripts.py
--- a/distutils/command/register.py
+++ b/distutils/command/register.py
--- a/distutils/command/sdist.py
+++ b/distutils/command/sdist.py
--- a/distutils/command/upload.py
+++ b/distutils/command/upload.py
--- a/distutils/command/wininst-10.0-amd64.exe
+++ b/distutils/command/wininst-10.0-amd64.exe
--- a/distutils/command/wininst-10.0.exe
+++ b/distutils/command/wininst-10.0.exe
--- a/distutils/command/wininst-14.0-amd64.exe
+++ b/distutils/command/wininst-14.0-amd64.exe
--- a/distutils/command/wininst-14.0.exe
+++ b/distutils/command/wininst-14.0.exe
--- a/distutils/command/wininst-6.0.exe
+++ b/distutils/command/wininst-6.0.exe
--- a/distutils/command/wininst-7.1.exe
+++ b/distutils/command/wininst-7.1.exe
--- a/distutils/command/wininst-8.0.exe
+++ b/distutils/command/wininst-8.0.exe
--- a/distutils/command/wininst-9.0-amd64.exe
+++ b/distutils/command/wininst-9.0-amd64.exe
--- a/distutils/command/wininst-9.0.exe
+++ b/distutils/command/wininst-9.0.exe
--- a/distutils/config.py
+++ b/distutils/config.py
--- a/distutils/core.py
+++ b/distutils/core.py
--- a/distutils/cygwinccompiler.py
+++ b/distutils/cygwinccompiler.py
--- a/distutils/debug.py
+++ b/distutils/debug.py
--- a/distutils/dep_util.py
+++ b/distutils/dep_util.py
--- a/distutils/dir_util.py
+++ b/distutils/dir_util.py
--- a/distutils/dist.py
+++ b/distutils/dist.py
--- a/distutils/errors.py
+++ b/distutils/errors.py
--- a/distutils/extension.py
+++ b/distutils/extension.py
--- a/distutils/fancy_getopt.py
+++ b/distutils/fancy_getopt.py
--- a/distutils/file_util.py
+++ b/distutils/file_util.py
--- a/distutils/filelist.py
+++ b/distutils/filelist.py
--- a/distutils/log.py
+++ b/distutils/log.py
--- a/distutils/msvc9compiler.py
+++ b/distutils/msvc9compiler.py
--- a/distutils/msvccompiler.py
+++ b/distutils/msvccompiler.py
--- a/distutils/spawn.py
+++ b/distutils/spawn.py
--- a/distutils/sysconfig.py
+++ b/distutils/sysconfig.py
--- a/distutils/tests/Setup.sample
+++ b/distutils/tests/Setup.sample
--- a/distutils/tests/__init__.py
+++ b/distutils/tests/__init__.py
--- a/distutils/tests/includetest.rst
+++ b/distutils/tests/includetest.rst
--- a/distutils/tests/py35compat.py
+++ b/distutils/tests/py35compat.py
--- a/distutils/tests/support.py
+++ b/distutils/tests/support.py
--- a/distutils/tests/test_archive_util.py
+++ b/distutils/tests/test_archive_util.py
--- a/distutils/tests/test_bdist.py
+++ b/distutils/tests/test_bdist.py
--- a/distutils/tests/test_bdist_dumb.py
+++ b/distutils/tests/test_bdist_dumb.py
--- a/distutils/tests/test_bdist_msi.py
+++ b/distutils/tests/test_bdist_msi.py
--- a/distutils/tests/test_bdist_rpm.py
+++ b/distutils/tests/test_bdist_rpm.py
--- a/distutils/tests/test_bdist_wininst.py
+++ b/distutils/tests/test_bdist_wininst.py
--- a/distutils/tests/test_build.py
+++ b/distutils/tests/test_build.py
--- a/distutils/tests/test_build_clib.py
+++ b/distutils/tests/test_build_clib.py
--- a/distutils/tests/test_build_ext.py
+++ b/distutils/tests/test_build_ext.py
--- a/distutils/tests/test_build_py.py
+++ b/distutils/tests/test_build_py.py
--- a/distutils/tests/test_build_scripts.py
+++ b/distutils/tests/test_build_scripts.py
--- a/distutils/tests/test_check.py
+++ b/distutils/tests/test_check.py
--- a/distutils/tests/test_clean.py
+++ b/distutils/tests/test_clean.py
--- a/distutils/tests/test_cmd.py
+++ b/distutils/tests/test_cmd.py
--- a/distutils/tests/test_config.py
+++ b/distutils/tests/test_config.py
--- a/distutils/tests/test_config_cmd.py
+++ b/distutils/tests/test_config_cmd.py
--- a/distutils/tests/test_core.py
+++ b/distutils/tests/test_core.py
--- a/distutils/tests/test_cygwinccompiler.py
+++ b/distutils/tests/test_cygwinccompiler.py
--- a/distutils/tests/test_dep_util.py
+++ b/distutils/tests/test_dep_util.py
--- a/distutils/tests/test_dir_util.py
+++ b/distutils/tests/test_dir_util.py
--- a/distutils/tests/test_dist.py
+++ b/distutils/tests/test_dist.py
--- a/distutils/tests/test_extension.py
+++ b/distutils/tests/test_extension.py
--- a/distutils/tests/test_file_util.py
+++ b/distutils/tests/test_file_util.py
--- a/distutils/tests/test_filelist.py
+++ b/distutils/tests/test_filelist.py
--- a/distutils/tests/test_install.py
+++ b/distutils/tests/test_install.py
--- a/distutils/tests/test_install_data.py
+++ b/distutils/tests/test_install_data.py
--- a/distutils/tests/test_install_headers.py
+++ b/distutils/tests/test_install_headers.py
--- a/distutils/tests/test_install_lib.py
+++ b/distutils/tests/test_install_lib.py
--- a/distutils/tests/test_install_scripts.py
+++ b/distutils/tests/test_install_scripts.py
--- a/distutils/tests/test_log.py
+++ b/distutils/tests/test_log.py
--- a/distutils/tests/test_msvc9compiler.py
+++ b/distutils/tests/test_msvc9compiler.py
--- a/distutils/tests/test_msvccompiler.py
+++ b/distutils/tests/test_msvccompiler.py
--- a/distutils/tests/test_register.py
+++ b/distutils/tests/test_register.py
--- a/distutils/tests/test_sdist.py
+++ b/distutils/tests/test_sdist.py
--- a/distutils/tests/test_spawn.py
+++ b/distutils/tests/test_spawn.py
--- a/distutils/tests/test_sysconfig.py
+++ b/distutils/tests/test_sysconfig.py
--- a/distutils/tests/test_text_file.py
+++ b/distutils/tests/test_text_file.py
--- a/distutils/tests/test_unixccompiler.py
+++ b/distutils/tests/test_unixccompiler.py
--- a/distutils/tests/test_upload.py
+++ b/distutils/tests/test_upload.py
--- a/distutils/tests/test_util.py
+++ b/distutils/tests/test_util.py
--- a/distutils/tests/test_version.py
+++ b/distutils/tests/test_version.py
--- a/distutils/tests/test_versionpredicate.py
+++ b/distutils/tests/test_versionpredicate.py
--- a/distutils/text_file.py
+++ b/distutils/text_file.py
--- a/distutils/unixccompiler.py
+++ b/distutils/unixccompiler.py
--- a/distutils/util.py
+++ b/distutils/util.py
--- a/distutils/version.py
+++ b/distutils/version.py
--- a/distutils/versionpredicate.py
+++ b/distutils/versionpredicate.py
--- a/setuptools/distutils_patch.py
+++ b/setuptools/distutils_patch.py