diff options
| author | Donald Stufft <donald@stufft.io> | 2016-09-09 11:36:59 -0400 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2016-09-09 11:36:59 -0400 |
| commit | 722b685dc1689412302e28008a207692b20265ba (patch) | |
| tree | 6e4ca974948ea0e149dd0a8112a7b6aeb9f69f78 | |
| parent | e13370b3e38c0714d3093d1235c6077bc6f62296 (diff) | |
| parent | 621333d2276d1d39728e19261585d90b7f58bb47 (diff) | |
| download | cpython-git-722b685dc1689412302e28008a207692b20265ba.tar.gz | |
Merge 3.5
| -rw-r--r-- | Lib/ensurepip/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl) | bin | 442860 -> 464970 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 6b4c57eb49..37e34ed979 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,7 +8,7 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "25.2.0" +_SETUPTOOLS_VERSION = "27.1.1" _PIP_VERSION = "8.1.2" diff --git a/Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl Binary files differindex 02c8ce8737..8e4ddc4f1a 100644 --- a/Lib/ensurepip/_bundled/setuptools-25.2.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl |