diff options
| -rw-r--r-- | .bumpversion.cfg | 2 | ||||
| -rw-r--r-- | CHANGES.rst | 9 | ||||
| -rw-r--r-- | conftest.py | 1 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | setuptools/__init__.py | 3 |
5 files changed, 13 insertions, 4 deletions
diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 05ff5f18..f2f2b271 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 49.0.0 +current_version = 49.1.0 commit = True tag = True diff --git a/CHANGES.rst b/CHANGES.rst index bd67931d..95dd2d24 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,9 @@ +v49.1.0 +------- + +* #2228: Disabled distutils adoption for now while emergent issues are addressed. + + v49.0.0 ------- @@ -10,7 +16,8 @@ v49.0.0 v48.0.0 ------- -* #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects. Although this change is not expected to break any use cases, it will likely affect tool chains that are monkey-patching distutils or relying on Setuptools' own monkey-patching of distutils. +* #2143: Setuptools adopts distutils from the Python 3.9 standard library and no longer depends on distutils in the standard library. When importing ``setuptools`` or ``setuptools.distutils_patch``, Setuptools will expose its bundled version as a top-level ``distutils`` package (and unload any previously-imported top-level distutils package), retaining the expectation that ``distutils``' objects are actually Setuptools objects. + To avoid getting any legacy behavior from the standard library, projects are advised to always "import setuptools" prior to importing anything from distutils. This behavior happens by default when using ``pip install`` or ``pep517.build``. Workflows that rely on ``setup.py (anything)`` will need to first ensure setuptools is imported. One way to achieve this behavior without modifying code is to invoke Python thus: ``python -c "import setuptools; exec(open('setup.py').read())" (anything)``. v47.3.2 diff --git a/conftest.py b/conftest.py index 72edcf14..50cc6509 100644 --- a/conftest.py +++ b/conftest.py @@ -15,6 +15,7 @@ collect_ignore = [ 'tests/manual_test.py', 'setuptools/tests/mod_with_constant.py', 'setuptools/_distutils', + 'setuptools/distutils_patch.py', ] @@ -16,7 +16,7 @@ formats = zip [metadata] name = setuptools -version = 49.0.0 +version = 49.1.0 description = Easily download, build, install, upgrade, and uninstall Python packages author = Python Packaging Authority author_email = distutils-sig@python.org diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 7a1f9f4f..a6cbe132 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -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 |