diff options
| -rw-r--r-- | changelog.d/2228.change.rst | 1 | ||||
| -rw-r--r-- | conftest.py | 1 | ||||
| -rw-r--r-- | setuptools/__init__.py | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/2228.change.rst b/changelog.d/2228.change.rst new file mode 100644 index 00000000..82cf8a05 --- /dev/null +++ b/changelog.d/2228.change.rst @@ -0,0 +1 @@ +Disabled distutils adoption for now while emergent issues are addressed. diff --git a/conftest.py b/conftest.py index 72edcf14..50cc6509 100644 --- 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', ] diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 7a1f9f4f..a6cbe132 100644 --- 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 |