Merge pull request #2231 from pypa/bugfix/disable-distutils

Disable distutils adoption

Merge pull request #2231 from pypa/bugfix/disable-distutils
Disable distutils adoption
86d7fbe5 · Jason R. Coombs · GitHub · e7e5817e · d0c71ab3 · 86d7fbe5
Commit 86d7fbe5 authored Jul 03, 2020 by Jason R. Coombs Committed by GitHub Jul 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

changelog.d/2228.change.rst changelog.d/2228.change.rst +1 -0

conftest.py conftest.py +1 -0

setuptools/__init__.py setuptools/__init__.py +2 -1

No files found.
--- a/changelog.d/2228.change.rst
+++ b/changelog.d/2228.change.rst
+Disabled distutils adoption for now while emergent issues are addressed.
--- a/conftest.py
+++ b/conftest.py
@@ -15,6 +15,7 @@ collect_ignore = [
    'tests/manual_test.py',
    'setuptools/tests/mod_with_constant.py',
    'setuptools/_distutils',
+    'setuptools/distutils_patch.py',
 ]

--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -3,7 +3,8 @@
 import os
 import functools
-import setuptools.distutils_patch  # noqa: F401
+# Disabled for now due to: #2228, #2230
+# import setuptools.distutils_patch  # noqa: F401
 import distutils.core
 import distutils.filelist