diff options
| author | Donald Stufft <donald@stufft.io> | 2015-07-01 15:31:13 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-07-01 15:31:13 (GMT) |
| commit | d6e51560b3475447ab6c8babbf93c486c7b87772 (patch) | |
| tree | a02f993e932cb0ea264423fac34392559e763353 | |
| parent | 04356e1f6f8f3bca6eaf07d7772813e7f2ba8282 (diff) | |
| parent | fe6399e894413d292a29f870fdbe5f36f01db68b (diff) | |
| download | cpython-d6e51560b3475447ab6c8babbf93c486c7b87772.zip cpython-d6e51560b3475447ab6c8babbf93c486c7b87772.tar.gz cpython-d6e51560b3475447ab6c8babbf93c486c7b87772.tar.bz2 | |
merge in setuptools/pip update
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl) | bin | 1118548 -> 1111835 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl) | bin | 461737 -> 461607 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 027b733..9bf3e12 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "17.0" +_SETUPTOOLS_VERSION = "18.0.1" -_PIP_VERSION = "7.0.3" +_PIP_VERSION = "7.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-7.0.3-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl Binary files differindex bb0cb31..76fcad1 100644 --- a/Lib/ensurepip/_bundled/pip-7.0.3-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl Binary files differindex a1d3561..67aaca5 100644 --- a/Lib/ensurepip/_bundled/setuptools-17.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl |