Merge pip and setuptools upgrade

2014-12-23 09:19:45 -05:00 · 2014-12-23 09:19:45 -05:00 · ab47932212
parent fa45c2e7a6 c8d94ba8f4
commit ab47932212
4 changed files with 2 additions and 2 deletions
--- a/Lib/ensurepip/init.py
+++ b/Lib/ensurepip/init.py
@ -8,9 +8,9 @@ import tempfile
 __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)
--- 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
--- 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
--- 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