diff options
| author | Donald Stufft <donald@stufft.io> | 2016-01-19 20:15:33 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2016-01-19 20:15:33 -0500 |
| commit | 33abe9a2104cbec9329a77b3e56993dcb554a09d (patch) | |
| tree | 8ebc87f4343fd6507bf96edf5ad7ca8c74841179 | |
| parent | 4918b47c64cd69b3fecc1a7d9adcca82f6ec711c (diff) | |
| parent | 1dce2c72edbafa4ef873a30142c3f955e108bc82 (diff) | |
| download | cpython-git-33abe9a2104cbec9329a77b3e56993dcb554a09d.tar.gz | |
Merge update to pip/setuptools
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl) | bin | 1111358 -> 1188709 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl) | bin | 461713 -> 471943 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 12588335d9..b293c725c7 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "18.2" +_SETUPTOOLS_VERSION = "19.4" -_PIP_VERSION = "7.1.2" +_PIP_VERSION = "8.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-7.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl Binary files differindex 5e490155f0..4e685be865 100644 --- a/Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl Binary files differindex f4288d68e0..b58455f31e 100644 --- a/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl |