Merge 3.4 into 3.5

c488bc6a · Donald Stufft · 5c13aa15 · 2bc69c49 · c488bc6a · c488bc6a
Commit c488bc6a authored Mar 17, 2016 by Donald Stufft
3 changed files
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@ import tempfile
 __all__ = ["version", "bootstrap"]


-_SETUPTOOLS_VERSION = "19.4"
+_SETUPTOOLS_VERSION = "20.3"

-_PIP_VERSION = "8.0.2"
+_PIP_VERSION = "8.1.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-8.0.2-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl
--- a/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl