diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-13 21:44:12 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-13 21:44:12 -0500 |
| commit | 0ce9908f72838e4c95a895177981d8136db973a9 (patch) | |
| tree | 375f6978b814a474638b65ce6dd7774c5a446d11 | |
| parent | ca919a203ad8b4bf79fb1b641c71be716c7538c5 (diff) | |
| parent | 5bf45c863a9b88a2c62fdaaeb75538c426ab5d41 (diff) | |
| download | python-setuptools-git-0ce9908f72838e4c95a895177981d8136db973a9.tar.gz | |
Merge with 8.0.1
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | ez_setup.py | 2 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
4 files changed, 10 insertions, 2 deletions
@@ -163,3 +163,4 @@ df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0 850a5c155c48b6ecfbb83b961586ea359b561522 8.0b1 7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0 1af3a5f24f7dd4e51d117f701918052b7de65c99 8.1b1 +d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1 diff --git a/CHANGES.txt b/CHANGES.txt index 0d2988a6..86886652 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,13 @@ CHANGES * Pull Request #85: Search egg-base when adding egg-info to manifest. +----- +8.0.1 +----- + +* Issue #296: Restore support for iteration over parse_version result, but + deprecated that usage with a warning. Fixes failure with buildout. + --- 8.0 --- diff --git a/ez_setup.py b/ez_setup.py index 59cfada2..17f64cc6 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -36,7 +36,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "8.1" +DEFAULT_VERSION = "8.0.2" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" def _python_cmd(*args): diff --git a/setuptools/version.py b/setuptools/version.py index ab31fdd3..94d3757b 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '8.1' +__version__ = '8.0.2' |