[Python-checkins] cpython (merge 3.4 -> 3.5): Merge - upgrade pip/setuptools

[donald.stufft]

https://hg.python.org/cpython/rev/e824e6113a04
changeset:   105138:e824e6113a04
branch:      3.5
parent:      105134:f8207c98eb5e
parent:      105137:80d4da2e78ec
user:        Donald Stufft <donald at stufft.io>
date:        Tue Nov 15 21:18:20 2016 -0500
summary:
  Merge - upgrade pip/setuptools

files:
  Lib/ensurepip/__init__.py                                     |    4 ++--
  Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl         |  Bin 
  Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl         |  Bin 
  Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-28.8.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 = "28.7.1"
+_SETUPTOOLS_VERSION = "28.8.0"
 
-_PIP_VERSION = "9.0.0"
+_PIP_VERSION = "9.0.1"
 
 # 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-9.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl
deleted file mode 100644
index 2c631a846c10cf51d32241263aff9c38a5bd8e27..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4b8ecc69db7e37fc6dd7b6dd8f690508f42866a1
GIT binary patch
[stripped]
diff --git 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
deleted file mode 100644
index cbcc2200f46eb05d707ad7c2c581ac36e561c256..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..502e3cb418c154872ad6e677ef8b63557b38ec35
GIT binary patch
[stripped]

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