diff options
author | Donald Stufft <donald@stufft.io> | 2016-09-09 16:15:07 (GMT) |
---|---|---|
committer | Donald Stufft <donald@stufft.io> | 2016-09-09 16:15:07 (GMT) |
commit | 783c9ef84dad5fc136a271ccd7fc30d2e556a58e (patch) | |
tree | e36bbdf03dcb732a6dd169b0ea1eb580ed3607ff | |
parent | f5307381794183d6e54f744761fe3af281900de9 (diff) | |
parent | 6bde454f9e8bb9139f3e9042c527b9ff15373246 (diff) | |
download | cpython-783c9ef84dad5fc136a271ccd7fc30d2e556a58e.zip cpython-783c9ef84dad5fc136a271ccd7fc30d2e556a58e.tar.gz cpython-783c9ef84dad5fc136a271ccd7fc30d2e556a58e.tar.bz2 |
Merge 3.5
-rw-r--r-- | Lib/ensurepip/__init__.py | 2 | ||||
-rw-r--r-- | Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl) | bin | 464970 -> 464973 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 37e34ed..fee1004d 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -8,7 +8,7 @@ import tempfile __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "27.1.1" +_SETUPTOOLS_VERSION = "27.1.2" _PIP_VERSION = "8.1.2" diff --git a/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl Binary files differindex 8e4ddc4..de213bb 100644 --- a/Lib/ensurepip/_bundled/setuptools-27.1.1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl |