From: Donald Stufft Date: Tue, 7 Apr 2015 05:32:24 +0000 (-0400) Subject: Upgrade pip to 6.1.0 and setuptools to 15.0 X-Git-Tag: v2.7.10rc1~65 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d27bcbd706200c4aebfb475d587bf2460f2c197e;p=thirdparty%2FPython%2Fcpython.git Upgrade pip to 6.1.0 and setuptools to 15.0 --- diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 81ebe6558b47..d165ef18119b 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -12,9 +12,9 @@ import tempfile __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.1.0-py2.py3-none-any.whl similarity index 68% rename from Lib/ensurepip/_bundled/pip-6.0.8-py2.py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-6.1.0-py2.py3-none-any.whl index be9238d94c10..2d075df9f0a0 100644 Binary files a/Lib/ensurepip/_bundled/pip-6.0.8-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-6.1.0-py2.py3-none-any.whl differ diff --git a/Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl similarity index 76% rename from Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl rename to Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl index 978cf6c43442..578ff3c31c7d 100644 Binary files a/Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl differ