merge: Upgrade pip to 7.0 and setuptools to 16.0

2015-05-22 00:39:57 -04:00 · 2015-05-22 00:39:57 -04:00 · 35e24a50c5
parent a18cad543f df9ba3623a
commit 35e24a50c5
3 changed files with 2 additions and 2 deletions
--- a/Lib/ensurepip/init.py
+++ b/Lib/ensurepip/init.py
@ -8,9 +8,9 @@ import tempfile
 __all__ = ["version", "bootstrap"]


-_SETUPTOOLS_VERSION = "15.2"
+_SETUPTOOLS_VERSION = "16.0"

-_PIP_VERSION = "6.1.1"
+_PIP_VERSION = "7.0.0"

 # pip currently requires ssl support, so we try to provide a nicer
 # error message when that is missing (http://bugs.python.org/issue19744)
--- a/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl
--- a/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl