Imported Upstream version 60.0.0

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 562bc7d3b6bafab884d43e3a876c9c957d3a4118..b458548161bc5e188653145617dab574273ba789 100644 (file)
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 59.8.0
+current_version = 60.0.0
 commit = True
 tag = True
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6b546dc477e7de62cf7881e3c14d4620646905b8..5a01e9a54213a05bf91c27270daae392bf455fc0 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -40,6 +40,25 @@ jobs:
             ${{ runner.os }},
             ${{ matrix.python }}
 
+  test_cygwin:
+    strategy:
+      matrix:
+        distutils:
+        - stdlib
+        - local
+    runs-on: windows-latest
+    env:
+      SETUPTOOLS_USE_DISTUTILS: ${{ matrix.distutils }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Cygwin with Python and tox
+        run: |
+          choco install git gcc-core python38-devel python38-pip --source cygwin
+          C:\\tools\\cygwin\\bin\\bash -l -x -c 'python3.8 -m pip install tox'
+      - name: Run tests
+        run: |
+          C:\\tools\\cygwin\\bin\\bash -l -x -c 'cd $(cygpath -u "$GITHUB_WORKSPACE") && tox -- --cov-report xml'
+
   release:
     needs: test
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')

diff --git a/CHANGES.rst b/CHANGES.rst
index 0b018b25de58161a8ccd6de658e40389e8786be8..3e658050500efeca7d19c5942e3d04fae148bc3c 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+v60.0.0
+-------
+
+
+Breaking Changes
+^^^^^^^^^^^^^^^^
+* #2896: Setuptools once again makes its local copy of distutils the default. To override, set SETUPTOOLS_USE_DISTUTILS=stdlib.
+
+
 v59.8.0
 -------
 

diff --git a/_distutils_hack/__init__.py b/_distutils_hack/__init__.py
index f707416286b22ddbdcf84f60b6ad38ded604bdfc..ae97a0b2b1eceaf7bbd2e2ec0a4184576c0e7c40 100644 (file)
--- 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/docs/conf.py b/docs/conf.py
index 3cc8e35b2323099f3d2d09f57ab225f9ba5da507..f6ccff0fcff617dcdd69323ff6f04532c8e634f0 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -68,6 +68,10 @@ link_files = {
                 pattern=r'pypa/distutils#(?P<distutils>\d+)',
                 url='{GH}/pypa/distutils/issues/{distutils}',
             ),
+            dict(
+                pattern=r'pypa/distutils@(?P<distutils_commit>[\da-f]+)',
+                url='{GH}/pypa/distutils/commit/{distutils_commit}',
+            ),
             dict(
                 pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
                 with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',

diff --git a/setup.cfg b/setup.cfg
index 21bdf4a083c32a4b9c6d668a72497acb5c6081a4..6a67e79da7e42c21b7e608a07d70a2c69fd83230 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = setuptools
-version = 59.8.0
+version = 60.0.0
 author = Python Packaging Authority
 author_email = distutils-sig@python.org
 description = Easily download, build, install, upgrade, and uninstall Python packages

diff --git a/setup.py b/setup.py
index c6affe9779feadd8d1b2cce01a316cd8897606be..4cda3d38900800259bf56618cf489d686749d46f 100755 (executable)
--- 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', '; ')