aboutsummaryrefslogtreecommitdiffstats
path: root/ez_setup.py
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2014-11-19 12:39:18 -0500
committerDonald Stufft <donald@stufft.io>2014-11-19 12:39:18 -0500
commit09ecca34b3eeb76d4f231040338e1c68bf770702 (patch)
tree54be2e06b0bf378a4a2daa616790fa9bf949bceb /ez_setup.py
parent5e62aa3b59398252faef0d638a0f087d6c682800 (diff)
parentaffa001a6767efee24b4d6bc1a2f04eb7aeea65b (diff)
downloadexternal_python_setuptools-09ecca34b3eeb76d4f231040338e1c68bf770702.tar.gz
external_python_setuptools-09ecca34b3eeb76d4f231040338e1c68bf770702.tar.bz2
external_python_setuptools-09ecca34b3eeb76d4f231040338e1c68bf770702.zip
Merge branch 'master' into use-packaging
Conflicts: .hgtags CHANGES.txt ez_setup.py setuptools.egg-info/requires.txt setuptools/version.py
Diffstat (limited to 'ez_setup.py')
-rw-r--r--ez_setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ez_setup.py b/ez_setup.py
index a523401e..f6361e8e 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -36,7 +36,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "7.0"
+DEFAULT_VERSION = "8.0"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
def _python_cmd(*args):