aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-02 10:41:22 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-06-02 10:41:22 -0400
commitfa3e4622dfdce9b43ddb0a61a6714f047c31a28b (patch)
tree03f768742e243ca55bab0f87f83adad994b6d5e0
parent35657c3486bf9943c3d31ffc2e61e18cdd4b9332 (diff)
parent641eac6550896506fa939205f249bcfb8f057d57 (diff)
downloadexternal_python_setuptools-fa3e4622dfdce9b43ddb0a61a6714f047c31a28b.tar.gz
external_python_setuptools-fa3e4622dfdce9b43ddb0a61a6714f047c31a28b.tar.bz2
external_python_setuptools-fa3e4622dfdce9b43ddb0a61a6714f047c31a28b.zip
Merge distribute 0.6.45
--HG-- rename : distribute_setup.py => ez_setup.py
-rw-r--r--.hgtags1
-rw-r--r--CHANGES.txt7
2 files changed, 8 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 5e073ef6..3795b833 100644
--- a/.hgtags
+++ b/.hgtags
@@ -58,3 +58,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
63e4eb2d61204f77f9b557201a0efa187b05a611 0.7b3
73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
53b4ac9a748aa28893aaca42c41e5e99568667bb 0.7b4
+ddca71ae5ceb9b14512dc60ea83802c10e224cf0 0.6.45
diff --git a/CHANGES.txt b/CHANGES.txt
index daa7622d..74e28d6e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,13 @@ Added several features that were slated for setuptools 0.6c12:
* Issue #3: Fixed NameError in SSL support.
------
+0.6.45
+------
+
+* Issue #379: ``distribute_setup.py`` now traps VersionConflict as well,
+ restoring ability to upgrade from an older setuptools version.
+
+------
0.6.44
------