summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2014-11-11 16:06:49 (GMT)
committerDonald Stufft <donald@stufft.io>2014-11-11 16:06:49 (GMT)
commit9a64ccb997a99f85c2538047823c7478bfcff6ed (patch)
tree70a9705026e71b1855087ed10d897c424dca8a64
parentf4f314ba3f6a3722f93961a53564412b7150c30b (diff)
parentdfede95a069d418c91a26d5999958b525172e687 (diff)
downloadcpython-9a64ccb997a99f85c2538047823c7478bfcff6ed.zip
cpython-9a64ccb997a99f85c2538047823c7478bfcff6ed.tar.gz
cpython-9a64ccb997a99f85c2538047823c7478bfcff6ed.tar.bz2
Merge - Upgrade setuptools to 7.0
-rw-r--r--Lib/ensurepip/__init__.py2
-rw-r--r--Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl)bin547415 -> 534549 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 4af1b1d..55160ee 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@ import tempfile
__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-7.0-py2.py3-none-any.whl
index f0ffcfc..fa1d105 100644
--- a/Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
Binary files differ