From 9e58d95017656ee33d2cf642cf1be6c77298f16d Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 12 Jul 2020 10:56:14 -0400 Subject: Re-enable distutils patch by default. --- changelog.d/2232.breaking.rst | 1 + setuptools/distutils_patch.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/2232.breaking.rst diff --git a/changelog.d/2232.breaking.rst b/changelog.d/2232.breaking.rst new file mode 100644 index 00000000..b2fd926f --- /dev/null +++ b/changelog.d/2232.breaking.rst @@ -0,0 +1 @@ +Once again, Setuptools overrides the stdlib distutils on import. For environments or invocations where this behavior is undesirable, users are provided with a temporary escape hatch. If the environment variable ``SETUPTOOLS_USE_DISTUTILS`` is set to ``stdlib``, Setuptools will fall back to the legacy behavior. Use of this escape hatch is discouraged, but it is provided to ease the transition while proper fixes for edge cases can be addressed. diff --git a/setuptools/distutils_patch.py b/setuptools/distutils_patch.py index c5f273dd..e6b2aad5 100644 --- a/setuptools/distutils_patch.py +++ b/setuptools/distutils_patch.py @@ -25,7 +25,7 @@ def enabled(): """ Allow selection of distutils by environment variable. """ - which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'stdlib') + which = os.environ.get('SETUPTOOLS_USE_DISTUTILS', 'local') return which == 'local' -- cgit v1.2.3