diff options
| author | Donald Stufft <donald@stufft.io> | 2015-05-22 04:39:57 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-05-22 04:39:57 (GMT) |
| commit | 35e24a50c569a822c3379ba05714d9bffa3550e5 (patch) | |
| tree | 0f221497373a049593c782f74fe62719c3ebfef0 | |
| parent | a18cad543f72a4de79df3dca3d79a75e762420aa (diff) | |
| parent | df9ba3623a1fcb745199b723ffd68e63f7a31153 (diff) | |
| download | cpython-35e24a50c569a822c3379ba05714d9bffa3550e5.zip cpython-35e24a50c569a822c3379ba05714d9bffa3550e5.tar.gz cpython-35e24a50c569a822c3379ba05714d9bffa3550e5.tar.bz2 | |
merge: Upgrade pip to 7.0 and setuptools to 16.0
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl) | bin | 1117916 -> 1118091 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl) | bin | 501948 -> 461608 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 7912053..16e0eee 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "15.2" +_SETUPTOOLS_VERSION = "16.0" -_PIP_VERSION = "6.1.1" +_PIP_VERSION = "7.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-6.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl Binary files differindex e59694a..926d2a7 100644 --- a/Lib/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl Binary files differindex f153ed3..fa4e994 100644 --- a/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-16.0-py2.py3-none-any.whl |