[Python-checkins] cpython (merge 3.4 -> 3.5): Merge updated to pip and setuptools

[donald.stufft]

https://hg.python.org/cpython/rev/3802560d1612
changeset:   97482:3802560d1612
branch:      3.5
parent:      97478:6de089e4d5b3
parent:      97481:71b59d01eea5
user:        Donald Stufft <donald at stufft.io>
date:        Mon Aug 24 16:14:20 2015 -0400
summary:
  Merge updated to pip and setuptools

files:
  Lib/ensurepip/__init__.py                                     |    4 ++--
  Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl         |  Bin 
  Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl         |  Bin 
  Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-18.2-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 = "18.0.1"
+_SETUPTOOLS_VERSION = "18.2"
 
-_PIP_VERSION = "7.1.0"
+_PIP_VERSION = "7.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-7.1.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl
deleted file mode 100644
index 76fcad1c7efb6223b049967e84fda31f9fd68dfc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5e490155f0ca7f4ddb64c93c39fb2efb8795cd08
GIT binary patch
[stripped]
diff --git 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
deleted file mode 100644
index 67aaca50a921a164fac7d721bc2aa80735c5515e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f4288d68e074466894d8a2342e113737df7b7649
GIT binary patch
[stripped]

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