Merge new pip/setuptools from 3.4

2016-11-02 15:53:58 -04:00 · 2016-11-02 15:53:58 -04:00 · 2af4144b7f
parent 72b34439bc 20a587bd67
commit 2af4144b7f
4 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 = "27.1.2"
+_SETUPTOOLS_VERSION = "28.7.1"

-_PIP_VERSION = "8.1.2"
+_PIP_VERSION = "9.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-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/pip-9.0.0-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl
--- a/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl