diff options
| author | Donald Stufft <donald@stufft.io> | 2015-01-28 22:57:05 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-01-28 22:57:05 (GMT) |
| commit | 6b9e2009fa257f3b7340b3e84cf0a4ed2e2c2ba9 (patch) | |
| tree | c81f1930be4194c04849eabf6eae94cea0f82542 | |
| parent | c54de477595a09e4e40497738882212c374f0227 (diff) | |
| parent | a89f5f049294c6d1782d9ec7be2d2b950c9a8619 (diff) | |
| download | cpython-6b9e2009fa257f3b7340b3e84cf0a4ed2e2c2ba9.zip cpython-6b9e2009fa257f3b7340b3e84cf0a4ed2e2c2ba9.tar.gz cpython-6b9e2009fa257f3b7340b3e84cf0a4ed2e2c2ba9.tar.bz2 | |
Merge 3.4 into default - Upgrade setuptools to 12.0.5 and pip to 6.0.7
| -rw-r--r-- | Lib/ensurepip/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/pip-6.0.7-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-6.0.6-py2.py3-none-any.whl) | bin | 1260783 -> 1263429 bytes | |||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl) | bin | 500312 -> 502329 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 9b9567e..0188b41 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,9 +8,9 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "11.3.1" +_SETUPTOOLS_VERSION = "12.0.5" -_PIP_VERSION = "6.0.6" +_PIP_VERSION = "6.0.7" # 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-6.0.6-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-6.0.7-py2.py3-none-any.whl Binary files differindex e2be105..e01e8c4 100644 --- a/Lib/ensurepip/_bundled/pip-6.0.6-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-6.0.7-py2.py3-none-any.whl diff --git a/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl Binary files differindex 6892ff8..978cf6c 100644 --- a/Lib/ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl |