[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[donald.stufft]

https://hg.python.org/cpython/rev/54c8d785bd39
changeset:   102657:54c8d785bd39
parent:      102653:9410dc027505
parent:      102656:2aa2fbb681d8
user:        Donald Stufft <donald at stufft.io>
date:        Sun Aug 14 16:10:31 2016 -0400
summary:
  merge 3.5

files:
  Lib/ensurepip/__init__.py                                      |    4 ++--
  Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl          |  Bin 
  Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl          |  Bin 
  Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl  |  Bin 
  5 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@
 __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)
diff --git a/Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
deleted file mode 100644
index 8632eb7af04c6337f0442a878ecb99cd2b1a67e0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git 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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cc49227a0c7e13757f4863a9b7ace1eb56c3ce61
GIT binary patch
[stripped]
diff --git 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
deleted file mode 100644
index 9d1319a24aba103fe956ef6298e3649efacc0b93..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..02c8ce8737bea57315cfff3b6b3b1a49eadacc6e
GIT binary patch
[stripped]

-- 
Repository URL: https://hg.python.org/cpython