summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.hgtags1
-rw-r--r--CHANGES.txt10
-rw-r--r--docs/developer-guide.txt2
-rw-r--r--ez_setup.py2
-rw-r--r--setuptools/version.py2
5 files changed, 14 insertions, 3 deletions
diff --git a/.hgtags b/.hgtags
index 11d53f44..26f830e1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -166,3 +166,4 @@ df26609c2f614f5fc9110342e4003ee8bd95cf84 7.0
d62bf4e407b3b9b5bedcc1396a9ba46f35571902 8.0.1
1c03d512e39d5cfd711ae3ed7e316769f427e43b 8.0.2
6c3467488123ce70b1dd009145a02f51fb78cdcc 8.0.3
+2c467afffe9fe1e14618b576fac6b4f7c412a61e 8.0.4
diff --git a/CHANGES.txt b/CHANGES.txt
index f79c3c00..4048ac8d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,16 @@ CHANGES
* Pull Request #85: Search egg-base when adding egg-info to manifest.
-----
+8.0.4
+-----
+
+* Upgrade ``packaging`` to 14.4, fixing an error where there is a
+ different result for if 2.0.5 is contained within >2.0dev and >2.0.dev even
+ though normalization rules should have made them equal.
+* Issue #296: Add warning when a version is parsed as legacy. This warning will
+ make it easier for developers to recognize deprecated version numbers.
+
+-----
8.0.3
-----
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index 651e6be8..558d6ee7 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -45,7 +45,7 @@ ticket already exists for your issue. If not, create one. Try to think from
the perspective of the reader. Explain what behavior you expected, what you
got instead, and what factors might have contributed to the unexpected
behavior. In Bitbucket, surround a block of code or traceback with the triple
-backtick "```" so that it is formatted nicely.
+backtick "\`\`\`" so that it is formatted nicely.
Filing a ticket provides a forum for justification, discussion, and
clarification. The ticket provides a record of the purpose for the change and
diff --git a/ez_setup.py b/ez_setup.py
index 15ceb5a5..6c77135b 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "8.0.4"
+DEFAULT_VERSION = "8.0.5"
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 09f50c23..d9d36010 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '8.0.4'
+__version__ = '8.0.5'