[Python-checkins] cpython (merge 3.5 -> default): merge update to pip/setuptools

[donald.stufft]

https://hg.python.org/cpython/rev/7556df35b913
changeset:   96482:7556df35b913
parent:      96477:6dffea6134ad
parent:      96481:5c4ba50f6a57
user:        Donald Stufft <donald at stufft.io>
date:        Tue Jun 02 11:40:15 2015 -0400
summary:
  merge update to pip/setuptools

files:
  Lib/ensurepip/__init__.py                                   |    4 ++--
  Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl       |  Bin 
  Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl       |  Bin 
  Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-17.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 = "16.0"
+_SETUPTOOLS_VERSION = "17.0"
 
-_PIP_VERSION = "7.0.1"
+_PIP_VERSION = "7.0.3"
 
 # 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.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl
deleted file mode 100644
index 30a61f0a0e9dde9b4dde32876e65213e7ceb4f8e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bb0cb3138ba4ade7fa5ba3285d04f70d439f490f
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl
deleted file mode 100644
index fa4e994929b5bd27f99a44c78e08f48d142ccfd9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a1d3561bad9c3709196b6481dd2e540b0914129b
GIT binary patch
[stripped]

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