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

Disable distutils adoption

changelog.d/2228.change.rst

+Disabled distutils adoption for now while emergent issues are addressed.

conftest.py

@@ -15,6 +15,7 @@ collect_ignore = [
     'tests/manual_test.py',
     'setuptools/tests/mod_with_constant.py',
     'setuptools/_distutils',
+    'setuptools/distutils_patch.py',
 ]
 
 

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