merge 3.4

2016-08-14 16:10:17 -04:00 · 2016-08-14 16:10:17 -04:00 · 80a3ba90fd
parent 91060f26f9 5e4aafa258
commit 80a3ba90fd
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 = "20.10.1"
+_SETUPTOOLS_VERSION = "25.2.0"

-_PIP_VERSION = "8.1.1"
+_PIP_VERSION = "8.1.2"

 # 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-8.1.2-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl
--- a/Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl