[Python-checkins] cpython (merge 3.4 -> default): Merge - Upgrade setuptools to 7.0

[donald.stufft]

https://hg.python.org/cpython/rev/d25c58a420d6
changeset:   93474:d25c58a420d6
parent:      93469:ac0334665459
parent:      93473:33908f14c0eb
user:        Donald Stufft <donald at stufft.io>
date:        Tue Nov 11 11:06:49 2014 -0500
summary:
  Merge - Upgrade setuptools to 7.0

files:
  Lib/ensurepip/__init__.py                                  |    2 +-
  Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl |  Bin 
  3 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "3.6"
+_SETUPTOOLS_VERSION = "7.0"
 
 _PIP_VERSION = "1.5.6"
 
diff --git a/Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl
deleted file mode 100644
index f0ffcfce5bb385e393a8385413f7a6092c51b33e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fa1d1054da1dab98f8906555d31a9fda271b3a85
GIT binary patch
[stripped]

-- 
Repository URL: https://hg.python.org/cpython