diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-28 20:54:46 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-28 20:54:46 -0500 |
| commit | 22715bcc472ac5b41cfcd94fa7ca26a5cef01eb9 (patch) | |
| tree | 1508667cf36e53f20ae13082ff1dc9bc52e3e460 | |
| parent | ee14a898847efe9d53f7dc57b872805753463eb5 (diff) | |
| download | external_python_setuptools-22715bcc472ac5b41cfcd94fa7ca26a5cef01eb9.tar.gz external_python_setuptools-22715bcc472ac5b41cfcd94fa7ca26a5cef01eb9.tar.bz2 external_python_setuptools-22715bcc472ac5b41cfcd94fa7ca26a5cef01eb9.zip | |
Disable purging of distutils/setuptools during sandbox operations. Ref #315.
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rwxr-xr-x | setuptools/sandbox.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index d0b7e9b0..463f45b8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,10 +8,6 @@ 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 f1b60cc0..e3c18e39 100755 --- a/setuptools/sandbox.py +++ b/setuptools/sandbox.py @@ -126,7 +126,9 @@ def setup_context(setup_dir): temp_dir = os.path.join(setup_dir, 'temp') with save_pkg_resources_state(): with save_modules(): - hide_setuptools() + # Disabled per + # https://bitbucket.org/pypa/setuptools/issue/315/setuptools-should-always-use-its-own#comment-14512075 + # hide_setuptools() with save_path(): with save_argv(): with override_temp(temp_dir): |