diff options
| author | Donald Stufft <donald@stufft.io> | 2015-04-07 05:30:33 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-04-07 05:30:33 (GMT) |
| commit | 9bcbdb40da0da2213c23a8d87ae57e6cbe6e616f (patch) | |
| tree | 1f6584dac7e58acd95a104897b9d414442106e9c /Lib | |
| parent | 146907081c63f4dfbf77ffc77cf50516a3ad4495 (diff) | |
| parent | fe508d1592df5bf22e98219ece3490dd1cc58d6e (diff) | |
| download | cpython-9bcbdb40da0da2213c23a8d87ae57e6cbe6e616f.zip cpython-9bcbdb40da0da2213c23a8d87ae57e6cbe6e616f.tar.gz cpython-9bcbdb40da0da2213c23a8d87ae57e6cbe6e616f.tar.bz2 | |
Merged update of pip to 6.1.0 and setuptools to 15.0
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-6.1.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-6.0.8-py2.py3-none-any.whl) | bin | 1266491 -> 1117902 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl) | bin | 502329 -> 501783 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 9766247..17a0078 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,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 Binary files differindex be9238d94..2d075df 100644 --- 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 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 Binary files differindex 978cf6c..578ff3c 100644 --- 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 |