Merge distribute 0.6.45

--HG-- rename : distribute_setup.py => ez_setup.py

Merge distribute 0.6.45
--HG-- rename : distribute_setup.py => ez_setup.py
fa3e4622 · Jason R. Coombs · 35657c34 · 641eac65 · fa3e4622 · fa3e4622
Commit fa3e4622 authored Jun 02, 2013 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

.hgtags .hgtags +1 -0

CHANGES.txt CHANGES.txt +7 -0

No files found.
--- 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
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,6 +26,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
 ------