From b6fcbbd00cb6d5607c9272dec452a50457bdb292 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 18 Nov 2021 21:18:26 -0500 Subject: [PATCH 1/3] Restore local distutils as the default. --- _distutils_hack/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py index 5f40996a67..0299a77976 100644 --- a/_distutils_hack/__init__.py +++ b/_distutils_hack/__init__.py @@ -42,7 +42,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' diff --git a/setup.py b/setup.py index c6affe9779..4cda3d3890 100755 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ class install_with_pth(install): _pth_contents = textwrap.dedent(""" import os var = 'SETUPTOOLS_USE_DISTUTILS' - enabled = os.environ.get(var, 'stdlib') == 'local' + enabled = os.environ.get(var, 'local') == 'local' enabled and __import__('_distutils_hack').add_shim() """).lstrip().replace('\n', '; ') From fe19053225a6030087df2b239b667b9617f9fc6c Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 18 Nov 2021 21:33:19 -0500 Subject: [PATCH 2/3] Update changelog. --- changelog.d/2896.change.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/2896.change.rst diff --git a/changelog.d/2896.change.rst b/changelog.d/2896.change.rst new file mode 100644 index 0000000000..e0aebdcb03 --- /dev/null +++ b/changelog.d/2896.change.rst @@ -0,0 +1 @@ +Setuptools once again makes its local copy of distutils the default. To override, set SETUPTOOLS_USE_DISTUTILS=stdlib. From 42b51eb3d5945a52256a55417e26807416a86ddd Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 10 Dec 2021 17:34:36 -0500 Subject: [PATCH 3/3] Consider this a breaking change. --- changelog.d/{2896.change.rst => 2896.breaking.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{2896.change.rst => 2896.breaking.rst} (100%) diff --git a/changelog.d/2896.change.rst b/changelog.d/2896.breaking.rst similarity index 100% rename from changelog.d/2896.change.rst rename to changelog.d/2896.breaking.rst