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

Tue Dec 23 15:19:53 CET 2014

https://hg.python.org/cpython/rev/651e1862dbed
changeset: 93953:651e1862dbed
parent: 93950:731b9653ef6b
parent: 93952:3d15227b15a8
user: Donald Stufft <donald at stufft.io>
date: Tue Dec 23 09:19:45 2014 -0500
summary:
 Merge pip and setuptools upgrade
files:
 Lib/ensurepip/__init__.py | 4 ++--
 Lib/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl | Bin 
 Lib/ensurepip/_bundled/pip-6.0.2-py2.py3-none-any.whl | Bin 
 Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl | Bin 
 Lib/ensurepip/_bundled/setuptools-8.2.1-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 = "7.0"
+_SETUPTOOLS_VERSION = "8.2.1"
 
-_PIP_VERSION = "1.5.6"
+_PIP_VERSION = "6.0.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-1.5.6-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
deleted file mode 100644
index 097ab43430d4c1302b0be353a8c16407c370693b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/pip-6.0.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-6.0.2-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..312467d98be6893a4a965af2e2f53b63188676c0
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
deleted file mode 100644
index fa1d1054da1dab98f8906555d31a9fda271b3a85..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/Lib/ensurepip/_bundled/setuptools-8.2.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-8.2.1-py2.py3-none-any.whl
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fa3a6a54053285d701c58cae779ebd9a8a992118
GIT binary patch
[stripped]
-- 
Repository URL: https://hg.python.org/cpython
