diff options
| author | Donald Stufft <donald@stufft.io> | 2015-05-23 00:30:57 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-05-23 00:30:57 (GMT) |
| commit | 256613c605bf207ed77616c04563275cfbaf3ee4 (patch) | |
| tree | 46f7b31a3737b65e6cf92bdef1c728836ca4a65b | |
| parent | f070f1cbbcc1ab2bf790173c26a5f022a866ac99 (diff) | |
| parent | 7bf0d5a759fb60170f305e0a4f3a5ad9c0882e67 (diff) | |
| download | cpython-256613c605bf207ed77616c04563275cfbaf3ee4.zip cpython-256613c605bf207ed77616c04563275cfbaf3ee4.tar.gz cpython-256613c605bf207ed77616c04563275cfbaf3ee4.tar.bz2 | |
Merge 3.4 into default, upgrading pip to 7.0.1
| -rw-r--r-- | Lib/ensurepip/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl) | bin | 1118091 -> 1118215 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 16e0eee..592ffde 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -10,7 +10,7 @@ __all__ = ["version", "bootstrap"] _SETUPTOOLS_VERSION = "16.0" -_PIP_VERSION = "7.0.0" +_PIP_VERSION = "7.0.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-7.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl Binary files differindex 926d2a7..30a61f0 100644 --- a/Lib/ensurepip/_bundled/pip-7.0.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-7.0.1-py2.py3-none-any.whl |