diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-05-08 21:32:19 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-05-08 21:32:19 -0400 |
| commit | 07abcf58d98f2f2ae36a4cb20331b9e72b36ad4d (patch) | |
| tree | 391a47e50a1533cff55b4cb930265118cf5a435d | |
| parent | 0171d7faa073ad9716c5548b4362e2092218d657 (diff) | |
| parent | b0fc24bff482dcdf923e014bd81639c07f7bdbc6 (diff) | |
| download | cpython-git-07abcf58d98f2f2ae36a4cb20331b9e72b36ad4d.tar.gz | |
merge heads
| -rw-r--r-- | Lib/ensurepip/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl) | bin | 501783 -> 501948 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 7598009022..7912053947 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,7 +8,7 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "15.0" +_SETUPTOOLS_VERSION = "15.2" _PIP_VERSION = "6.1.1" diff --git a/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl Binary files differindex 578ff3c31c..f153ed3766 100644 --- a/Lib/ensurepip/_bundled/setuptools-15.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl |