diff options
| -rw-r--r-- | .hgtags | 4 | ||||
| -rw-r--r-- | CHANGES.txt | 32 | ||||
| -rw-r--r-- | ez_setup.py | 4 | ||||
| -rw-r--r-- | pkg_resources.py | 6 | ||||
| -rwxr-xr-x | setup.py | 1 | ||||
| -rw-r--r-- | setuptools.egg-info/entry_points.txt | 1 | ||||
| -rw-r--r-- | setuptools/dist.py | 2 | ||||
| -rw-r--r-- | setuptools/svn_utils.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_integration.py | 3 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
10 files changed, 48 insertions, 9 deletions
@@ -149,3 +149,7 @@ f493e6c4ffd88951871110858c141385305e0077 5.2 baae103e80c307008b156e426a07eb9f486eb4f0 5.4 ba3b08c7bffd6123e1a7d58994f15e8051a67cb7 5.4.1 7adcf1397f6eccb9e73eda294343de2943f7c8fb 5.4.2 +68910a89f97a508a64f9f235dc64ad43d4477ea0 5.5 +949a66af4f03521e1404deda940aa951418a13d2 5.5.1 +a1fc0220bfa3581158688789f6dfdc00672eb99b 5.6 +37ed55fd310d0cd32009dc5676121e86b404a23d 5.7 diff --git a/CHANGES.txt b/CHANGES.txt index bb5dc66f..83b05bbe 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,38 @@ CHANGES ======= +--- +5.7 +--- + +* Issue #240: Based on real-world performance measures against 5.4, zip + manifests are now cached in all circumstances. The + ``PKG_RESOURCES_CACHE_ZIP_MANIFESTS`` environment variable is no longer + relevant. The observed "memory increase" referenced in the 5.4 release + notes and detailed in Issue #154 was likely not an increase over the status + quo, but rather only an increase over not storing the zip info at all. + +--- +5.6 +--- + +* Issue #242: Use absolute imports in svn_utils to avoid issues if the + installing package adds an xml module to the path. + +----- +5.5.1 +----- + +* Issue #239: Fix typo in 5.5 such that fix did not take. + +--- +5.5 +--- + +* Issue #239: Setuptools now includes the setup_requires directive on + Distribution objects and validates the syntax just like install_requires + and tests_require directives. + ----- 5.4.2 ----- diff --git a/ez_setup.py b/ez_setup.py index 791973ec..74c8224a 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -36,7 +36,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "5.4.3" +DEFAULT_VERSION = "5.8" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): @@ -268,7 +268,7 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL, Download setuptools from a specified location and return its filename `version` should be a valid setuptools version number that is available - as an egg for download under the `download_base` URL (which should end + as an sdist for download under the `download_base` URL (which should end with a '/'). `to_dir` is the directory where the egg will be downloaded. `delay` is the number of seconds to pause before an actual download attempt. diff --git a/pkg_resources.py b/pkg_resources.py index 11debf65..ee2c553b 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1605,11 +1605,7 @@ class ZipProvider(EggProvider): """Resource support for zips and eggs""" eagers = None - _zip_manifests = ( - MemoizedZipManifests() - if os.environ.get('PKG_RESOURCES_CACHE_ZIP_MANIFESTS') else - ZipManifests() - ) + _zip_manifests = MemoizedZipManifests() def __init__(self, module): EggProvider.__init__(self, module) @@ -144,6 +144,7 @@ setup_params = dict( "extras_require = setuptools.dist:check_extras", "install_requires = setuptools.dist:check_requirements", "tests_require = setuptools.dist:check_requirements", + "setup_requires = setuptools.dist:check_requirements", "entry_points = setuptools.dist:check_entry_points", "test_suite = setuptools.dist:check_test_suite", "zip_safe = setuptools.dist:assert_bool", diff --git a/setuptools.egg-info/entry_points.txt b/setuptools.egg-info/entry_points.txt index de842da8..72a5ffe0 100644 --- a/setuptools.egg-info/entry_points.txt +++ b/setuptools.egg-info/entry_points.txt @@ -36,6 +36,7 @@ install_requires = setuptools.dist:check_requirements namespace_packages = setuptools.dist:check_nsp package_data = setuptools.dist:check_package_data packages = setuptools.dist:check_packages +setup_requires = setuptools.dist:check_requirements test_loader = setuptools.dist:check_importable test_runner = setuptools.dist:check_importable test_suite = setuptools.dist:check_test_suite diff --git a/setuptools/dist.py b/setuptools/dist.py index dac4dfa8..8b36f67c 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -259,7 +259,7 @@ class Distribution(_Distribution): self.dependency_links = attrs.pop('dependency_links', []) assert_string_list(self,'dependency_links',self.dependency_links) if attrs and 'setup_requires' in attrs: - self.fetch_build_eggs(attrs.pop('setup_requires')) + self.fetch_build_eggs(attrs['setup_requires']) for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'): if not hasattr(self,ep.name): setattr(self,ep.name,None) diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py index 2dcfd899..dadb682a 100644 --- a/setuptools/svn_utils.py +++ b/setuptools/svn_utils.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import
+
import os
import re
import sys
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py index 7144aa6c..8d6c1e55 100644 --- a/setuptools/tests/test_integration.py +++ b/setuptools/tests/test_integration.py @@ -25,6 +25,9 @@ def install_context(request, tmpdir, monkeypatch): install_dir = tmpdir.mkdir('install_dir') def fin(): + # undo the monkeypatch, particularly needed under + # windows because of kept handle on cwd + monkeypatch.undo() new_cwd.remove() user_base.remove() user_site.remove() diff --git a/setuptools/version.py b/setuptools/version.py index 0e0a34f9..868f2d33 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '5.4.3' +__version__ = '5.8' |