diff options
| author | Donald Stufft <donald@stufft.io> | 2015-05-08 21:30:37 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2015-05-08 21:30:37 -0400 |
| commit | 9020a9a226ec868d98a3f262efccc90295463f1c (patch) | |
| tree | d235ae1539cf9e24988f31ec4aec14c9d9fd126e | |
| parent | d924198268faf207630694760a8d1862d03c9817 (diff) | |
| parent | b0fc24bff482dcdf923e014bd81639c07f7bdbc6 (diff) | |
| download | cpython-git-9020a9a226ec868d98a3f262efccc90295463f1c.tar.gz | |
merge - upgrade setuptools to 15.2
| -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 |