diff options
| author | Donald Stufft <donald@stufft.io> | 2016-09-09 16:14:43 (GMT) |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2016-09-09 16:14:43 (GMT) |
| commit | 6bde454f9e8bb9139f3e9042c527b9ff15373246 (patch) | |
| tree | d3fd0ac82e5e21fc29a05453d005465cc3d3a9a6 /Lib | |
| parent | 621333d2276d1d39728e19261585d90b7f58bb47 (diff) | |
| parent | 16d7d5941dee8cebd156752d337109abc1b39d2e (diff) | |
| download | cpython-6bde454f9e8bb9139f3e9042c527b9ff15373246.zip cpython-6bde454f9e8bb9139f3e9042c527b9ff15373246.tar.gz cpython-6bde454f9e8bb9139f3e9042c527b9ff15373246.tar.bz2 | |
Merge 3.4
Diffstat (limited to 'Lib')
| -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 |