merge in setuptools/pip update

2015-07-01 11:31:13 -04:00 · 2015-07-01 11:31:13 -04:00 · d6e51560b3
parent 04356e1f6f fe6399e894
commit d6e51560b3
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 = "17.0"
+_SETUPTOOLS_VERSION = "18.0.1"

-_PIP_VERSION = "7.0.3"
+_PIP_VERSION = "7.1.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.1.0-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl
--- a/Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl