Merge 3.4 into default, upgrading pip to 7.0.1

2015-05-22 20:30:57 -04:00 · 2015-05-22 20:30:57 -04:00 · 256613c605
parent f070f1cbbc 7bf0d5a759
commit 256613c605
2 changed files with 1 additions and 1 deletions
--- a/Lib/ensurepip/init.py
+++ b/Lib/ensurepip/init.py
@ -10,7 +10,7 @@ __all__ = ["version", "bootstrap"]

 _SETUPTOOLS_VERSION = "16.0"

-_PIP_VERSION = "7.0.0"
+_PIP_VERSION = "7.0.1"

 # 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.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl