diff options
| author | Donald Stufft <donald@stufft.io> | 2016-08-14 20:10:31 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2016-08-14 20:10:31 (GMT) |
| commit | 704813f1ad6841b289883dfb3cefebef65924713 (patch) | |
| tree | c7f38aec53335ce724d9116430ac7d47435567da | |
| parent | dd51d16b485f013c8f6489fede4faf1686c59e5e (diff) | |
| parent | 80a3ba90fd46ca3857206f35d6ee68270aab6eba (diff) | |
| download | cpython-704813f1ad6841b289883dfb3cefebef65924713.zip cpython-704813f1ad6841b289883dfb3cefebef65924713.tar.gz cpython-704813f1ad6841b289883dfb3cefebef65924713.tar.bz2 | |
merge 3.5
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl) | bin | 1197664 -> 1198961 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl) | bin | 509211 -> 442860 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 08aedf9..6b4c57e 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "20.10.1" +_SETUPTOOLS_VERSION = "25.2.0" -_PIP_VERSION = "8.1.1" +_PIP_VERSION = "8.1.2" # 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-8.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl Binary files differindex 8632eb7..cc49227 100644 --- a/Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl Binary files differindex 9d1319a..02c8ce8 100644 --- a/Lib/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl |