Merge with 8.0.2

cddaa77b · Jason R. Coombs · fe426617 · 4caa4af6 · cddaa77b · cddaa77b
Commit cddaa77b authored Dec 14, 2014 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

.hgtags .hgtags +1 -0

CHANGES.txt CHANGES.txt +7 -0

ez_setup.py ez_setup.py +1 -1

setuptools/version.py setuptools/version.py +1 -1

No files found.
--- 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
--- 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.2
+-----
+
+* Issue #296: Restored support for ``__getitem__`` and sort operations on
+  parse_version result.
+
 -----
 8.0.1
 -----

--- 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):

--- a/setuptools/version.py
+++ b/setuptools/version.py
-__version__ = '8.0.2'
+__version__ = '8.0.3'