diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-15 13:32:59 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-15 13:32:59 -0500 |
| commit | fa32ede024a1429c376b3249d23273ffe9c235d4 (patch) | |
| tree | 27c1f87e13d9aefceaa1b439b040721ff2378179 | |
| parent | 512f72a690120a6b08ff99d2ed9065859586a698 (diff) | |
| parent | ee2cd1464e2073ba37be8e3003536f2602d51b13 (diff) | |
| download | python-setuptools-git-fa32ede024a1429c376b3249d23273ffe9c235d4.tar.gz | |
Merge with 8.0.3
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rw-r--r-- | ez_setup.py | 2 | ||||
| -rw-r--r-- | setuptools/version.py | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -165,3 +165,4 @@ df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0 1af3a5f24f7dd4e51d117f701918052b7de65c99 8.1b1 d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1 1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2 +6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3 diff --git a/CHANGES.txt b/CHANGES.txt index 45c87f91..f79c3c00 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,12 @@ CHANGES * Pull Request #85: Search egg-base when adding egg-info to manifest. ----- +8.0.3 +----- + +* Issue #296: Restored support for ``__hash__`` on parse_version results. + +----- 8.0.2 ----- diff --git a/ez_setup.py b/ez_setup.py index 70a9a7ee..15ceb5a5 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -36,7 +36,7 @@ try: except ImportError: USER_SITE = None -DEFAULT_VERSION = "8.0.3" +DEFAULT_VERSION = "8.0.4" 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 854fb2e8..09f50c23 100644 --- a/setuptools/version.py +++ b/setuptools/version.py @@ -1 +1 @@ -__version__ = '8.0.3' +__version__ = '8.0.4' |