diff options
| author | Donald Stufft <donald@stufft.io> | 2014-11-11 11:06:49 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-11-11 11:06:49 -0500 |
| commit | 9a64ccb997a99f85c2538047823c7478bfcff6ed (patch) | |
| tree | 70a9705026e71b1855087ed10d897c424dca8a64 | |
| parent | f4f314ba3f6a3722f93961a53564412b7150c30b (diff) | |
| parent | dfede95a069d418c91a26d5999958b525172e687 (diff) | |
| download | cpython-git-9a64ccb997a99f85c2538047823c7478bfcff6ed.tar.gz | |
Merge - Upgrade setuptools to 7.0
| -rw-r--r-- | Lib/ensurepip/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl) | bin | 547415 -> 534549 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 4af1b1d6d0..55160eef85 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,7 +8,7 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "3.6" +_SETUPTOOLS_VERSION = "7.0" _PIP_VERSION = "1.5.6" diff --git a/Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl Binary files differindex f0ffcfce5b..fa1d1054da 100644 --- a/Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl |