[Python-checkins] cpython (merge 3.4 -> default): Merged update of pip to 6.1.0 and setuptools to 15.0

[donald.stufft]

https://hg.python.org/cpython/rev/9a0caf6e7a16
changeset:   95464:9a0caf6e7a16
parent:      95461:5983f3fdacdb
parent:      95463:7e2a7de211b4
user:        Donald Stufft <donald at stufft.io>
date:        Tue Apr 07 01:30:33 2015 -0400
summary:
  Merged update of pip to 6.1.0 and setuptools to 15.0

files:
  Lib/ensurepip/__init__.py                                     |    4 ++--
  Lib/ensurepip/_bundled/pip-6.0.8-py2.py3-none-any.whl         |  Bin 
  Lib/ensurepip/_bundled/pip-6.1.0-py2.py3-none-any.whl         |  Bin 
  Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-15.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 = "12.0.5"
+_SETUPTOOLS_VERSION = "15.0"
 
-_PIP_VERSION = "6.0.8"
+_PIP_VERSION = "6.1.0"
 
 # 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-6.0.8-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-6.0.8-py2.py3-none-any.whl
deleted file mode 100644
index be9238d94c10081b4450aad01851f4c4eda1897c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-6.1.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-6.1.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2d075df9f0a002d8d3e08c2d5eb08cfb7e837290
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl
deleted file mode 100644
index 978cf6c43442faecdb4e8b84a3c2c0bc1bc0ec01..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..578ff3c31c7db40f8777aa1272566362a3793956
GIT binary patch
[stripped]

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