diff options
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rwxr-xr-x | setuptools/sandbox.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 73ddaff7..bc257058 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,10 @@ CHANGES * Issue #314: Disabled support for ``setup_requires`` metadata to avoid issue where Setuptools was unable to upgrade over earlier versions. +* Issue #315: Updated setuptools to hide its own loaded modules during + installation of another package. This change will enable setuptools to + upgrade (or downgrade) itself even when its own metadata and implementation + change. --- 8.4 diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py index e3c18e39..f1b60cc0 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -126,9 +126,7 @@ def setup_context(setup_dir): temp_dir = os.path.join(setup_dir, 'temp') with save_pkg_resources_state(): with save_modules(): - # Disabled per - # https://bitbucket.org/pypa/setuptools/issue/315/setuptools-should-always-use-its-own#comment-14512075 - # hide_setuptools() + hide_setuptools() with save_path(): with save_argv(): with override_temp(temp_dir): |