aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-28 11:40:08 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-28 11:40:08 -0400
commitfb7c407b9947ba508938d04acebd18c78fb66ded (patch)
treea600d1c18e4afec67a61f7c2c172df74ee927a0f
parent9d50157d521db8e339228d6da0d7fa0ef126b927 (diff)
parentb39c770280a208f82159352d2bdf086775b46d92 (diff)
downloadexternal_python_setuptools-fb7c407b9947ba508938d04acebd18c78fb66ded.tar.gz
external_python_setuptools-fb7c407b9947ba508938d04acebd18c78fb66ded.tar.bz2
external_python_setuptools-fb7c407b9947ba508938d04acebd18c78fb66ded.zip
Merge with Distribute 0.6.44
--HG-- rename : distribute_setup.py => ez_setup.py
-rw-r--r--.hgtags1
-rw-r--r--.travis.yml1
-rw-r--r--CHANGES.txt7
3 files changed, 9 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 2d205d99..7314696f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -56,3 +56,4 @@ f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42
8951daac6c1bc7b24c7fb054fd369f2c5b88cdb3 0.7b2
35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43
63e4eb2d61204f77f9b557201a0efa187b05a611 0.7b3
+73aa98aee6bbc4a9d19a334a8ac928dece7799c6 0.6.44
diff --git a/.travis.yml b/.travis.yml
index cbc671e7..83efa5a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,6 @@ python:
- 2.6
- 2.7
- 3.2
+ - 3.3
# command to run tests
script: python setup.py test
diff --git a/CHANGES.txt b/CHANGES.txt
index 9796fd59..a11ab364 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,13 @@ Added several features that were slated for setuptools 0.6c12:
an HTTPS service.
------
+0.6.44
+------
+
+* ``distribute_setup.py`` has been updated to allow Setuptools 0.7 to
+ satisfy use_setuptools.
+
+------
0.6.43
------