Merge pull request #2896 from pypa/feature/local-distutils

Restore local distutils as the default.
pypa · Dec 20, 2021 · f7a55da · f7a55da
2 parents ed23173 + 42b51eb
commit f7a55da
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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/changelog.d/2896.breaking.rst b/changelog.d/2896.breaking.rst
@@ -0,0 +1 @@
+Setuptools once again makes its local copy of distutils the default. To override, set SETUPTOOLS_USE_DISTUTILS=stdlib.
diff --git 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', '; ')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Setuptools once again makes its local copy of distutils the default. To override, set SETUPTOOLS_USE_DISTUTILS=stdlib.