summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-12-14 17:31:56 -0500
committerJason R. Coombs <jaraco@jaraco.com>2014-12-14 17:31:56 -0500
commitcddaa77be7c82b6796b43e017c16c6c08727b402 (patch)
treea438f812fddaefa7ff70f156a014783f8cbdad77
parentfe426617d37686dc8c5bc144390add05385e2766 (diff)
parent4caa4af6ae275db9a499c27b66cc636cb9c596a1 (diff)
downloadpython-setuptools-git-cddaa77be7c82b6796b43e017c16c6c08727b402.tar.gz
Merge with 8.0.2
-rw-r--r--.hgtags1
-rw-r--r--CHANGES.txt7
-rw-r--r--ez_setup.py2
-rw-r--r--setuptools/version.py2
4 files changed, 10 insertions, 2 deletions
diff --git a/.hgtags b/.hgtags
index 6415d4fc..f0bf73db 100644
--- a/.hgtags
+++ b/.hgtags
@@ -164,3 +164,4 @@ df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
7ea0e7498e4ddbf63b6929ee83c75a9207996b08 8.0
1af3a5f24f7dd4e51d117f701918052b7de65c99 8.1b1
d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
+1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2
diff --git a/CHANGES.txt b/CHANGES.txt
index 86886652..45c87f91 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,13 @@ CHANGES
* Pull Request #85: Search egg-base when adding egg-info to manifest.
-----
+8.0.2
+-----
+
+* Issue #296: Restored support for ``__getitem__`` and sort operations on
+ parse_version result.
+
+-----
8.0.1
-----
diff --git a/ez_setup.py b/ez_setup.py
index 17f64cc6..70a9a7ee 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "8.0.2"
+DEFAULT_VERSION = "8.0.3"
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 94d3757b..854fb2e8 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0.2'
+__version__ = '8.0.3'