[Python-checkins] cpython (merge 3.4 -> default): merge: Upgrade pip to 7.0 and setuptools to 16.0

[donald.stufft]

https://hg.python.org/cpython/rev/1ca30423b0c9
changeset:   96200:1ca30423b0c9
parent:      96198:5691d2d2d0a4
parent:      96199:16c42506fbdf
user:        Donald Stufft <donald at stufft.io>
date:        Fri May 22 00:39:57 2015 -0400
summary:
  merge: Upgrade pip to 7.0 and setuptools to 16.0

files:
  Lib/ensurepip/__init__.py                                   |    4 ++--
  Lib/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl       |  Bin 
  Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl       |  Bin 
  Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl |  Bin 
  Lib/ensurepip/_bundled/setuptools-16.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 = "15.2"
+_SETUPTOOLS_VERSION = "16.0"
 
-_PIP_VERSION = "6.1.1"
+_PIP_VERSION = "7.0.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.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
deleted file mode 100644
index e59694a019051d58b9a378a1adfc9461b8cec9c3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..926d2a79fa715a9f9a9825a6304bcbd96683612e
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
deleted file mode 100644
index f153ed376684275e08fcfebdb2de8352fb074171..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
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
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fa4e994929b5bd27f99a44c78e08f48d142ccfd9
GIT binary patch
[stripped]

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