(original) (raw)

changeset: 96481:5c4ba50f6a57 branch: 3.5 parent: 96476:f39e9bcd789b parent: 96480:34d5a66fd3e0 user: Donald Stufft donald@stufft.io date: Tue Jun 02 11:39:55 2015 -0400 files: Lib/ensurepip/__init__.py Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl description: Merge update to pip/setuptools diff -r f39e9bcd789b -r 5c4ba50f6a57 Lib/ensurepip/__init__.py --- a/Lib/ensurepip/__init__.py Tue Jun 02 10:38:01 2015 -0400 +++ b/Lib/ensurepip/__init__.py Tue Jun 02 11:39:55 2015 -0400 @@ -8,9 +8,9 @@ __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "16.0" +_SETUPTOOLS_VERSION = "17.0" -_PIP_VERSION = "7.0.1" +_PIP_VERSION = "7.0.3" # pip currently requires ssl support, so we try to provide a nicer # error message when that is missing (http://bugs.python.org/issue19744) diff -r f39e9bcd789b -r 5c4ba50f6a57 Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl Binary file Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl has changed diff -r f39e9bcd789b -r 5c4ba50f6a57 Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl Binary file Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl has changed diff -r f39e9bcd789b -r 5c4ba50f6a57 Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl Binary file Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl has changed diff -r f39e9bcd789b -r 5c4ba50f6a57 Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl Binary file Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl has changed /donald@stufft.io