diff options
| author | Donald Stufft <donald@stufft.io> | 2016-03-17 15:01:04 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2016-03-17 15:01:04 (GMT) |
| commit | c488bc6a76b99f579039edaa52aeb26e54f96d3b (patch) | |
| tree | aecb9d5c1de762aae75749bd521e0b0a0e624895 /Lib | |
| parent | 5c13aa156255d672aeee4d32bc0965e20c7d6c51 (diff) | |
| parent | 2bc69c49e1c32f895dd0f521d691c1ea427829ef (diff) | |
| download | cpython-c488bc6a76b99f579039edaa52aeb26e54f96d3b.zip cpython-c488bc6a76b99f579039edaa52aeb26e54f96d3b.tar.gz cpython-c488bc6a76b99f579039edaa52aeb26e54f96d3b.tar.bz2 | |
Merge 3.4 into 3.5
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl) | bin | 1188805 -> 1197664 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl) | bin | 471943 -> 508316 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 1b7311e..412b590 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "19.4" +_SETUPTOOLS_VERSION = "20.3" -_PIP_VERSION = "8.0.2" +_PIP_VERSION = "8.1.1" # 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.0.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl Binary files differindex cff6237..8632eb7 100644 --- a/Lib/ensurepip/_bundled/pip-8.0.2-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl Binary files differindex b58455f..39e67c0 100644 --- a/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-20.3-py2.py3-none-any.whl |