diff options
| author | Donald Stufft <donald@stufft.io> | 2016-09-09 15:35:43 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2016-09-09 15:35:43 (GMT) |
| commit | 621333d2276d1d39728e19261585d90b7f58bb47 (patch) | |
| tree | ebd7ce3a3865748b7b8adef8074b3971d1e54877 | |
| parent | eaab1ca5586a824fa850ee705fdead46a28b4684 (diff) | |
| parent | d25d9dc1fcea0821632932a0c3392068fca1431b (diff) | |
| download | cpython-621333d2276d1d39728e19261585d90b7f58bb47.zip cpython-621333d2276d1d39728e19261585d90b7f58bb47.tar.gz cpython-621333d2276d1d39728e19261585d90b7f58bb47.tar.bz2 | |
Merge 3.4
| -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 6b4c57e..37e34ed 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 02c8ce8..8e4ddc4 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 |