diff options
| author | Donald Stufft <donald@stufft.io> | 2016-11-02 15:53:58 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2016-11-02 15:53:58 -0400 |
| commit | 2af4144b7ff32e22d593fe16ce6f7762df94fbc5 (patch) | |
| tree | 216783036bc18f673f9738c9a5cdc1159da92ee5 /Lib/ensurepip | |
| parent | 72b34439bc228a84d150533a04eac17822baf832 (diff) | |
| parent | 20a587bd67cb194d5d0b7e98ba67312cb6516300 (diff) | |
| download | cpython-git-2af4144b7ff32e22d593fe16ce6f7762df94fbc5.tar.gz | |
Merge new pip/setuptools from 3.4
Diffstat (limited to 'Lib/ensurepip')
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl | bin | 1198961 -> 0 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl | bin | 0 -> 1254648 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl) | bin | 464973 -> 472493 bytes |
4 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index fee1004d95..68853ef012 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "27.1.2" +_SETUPTOOLS_VERSION = "28.7.1" -_PIP_VERSION = "8.1.2" +_PIP_VERSION = "9.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-8.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl Binary files differdeleted file mode 100644 index cc49227a0c..0000000000 --- a/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl +++ /dev/null diff --git a/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl Binary files differnew file mode 100644 index 0000000000..2c631a846c --- /dev/null +++ b/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl Binary files differindex de213bb727..cbcc2200f4 100644 --- a/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl |