Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/2228.change.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Disabled distutils adoption for now while emergent issues are addressed.
1 change: 1 addition & 0 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def pytest_addoption(parser):
'tests/manual_test.py',
'setuptools/tests/mod_with_constant.py',
'setuptools/_distutils',
'setuptools/distutils_patch.py',
]


Expand Down
3 changes: 2 additions & 1 deletion setuptools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down