| commit | d8c5f82285ae8944a5ef9c1ebc4bd684ff9589d8 | [log] [tgz] |
|---|---|---|
| author | Donald Stufft <donald@stufft.io> | Mon Aug 24 16:14:20 2015 -0400 |
| committer | Donald Stufft <donald@stufft.io> | Mon Aug 24 16:14:20 2015 -0400 |
| tree | c0bf183290d0a16cb07f0d82fd445d7e33defe1c | |
| parent | f51fd7bc1a2bafabdebc58c95faaac10dc1abc39 [diff] | |
| parent | b372356d0a7e553c3d76bafe5fdcfc5312b3fc15 [diff] |
Merge updated to pip and setuptools
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 9bf3e12..1258833 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@ __all__ = ["version", "bootstrap"] -_SETUPTOOLS_VERSION = "18.0.1" +_SETUPTOOLS_VERSION = "18.2" -_PIP_VERSION = "7.1.0" +_PIP_VERSION = "7.1.2" # pip currently requires ssl support, so we try to provide a nicer # error message when that is missing (http://bugs.python.org/issue19744)
diff --git a/Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl similarity index 68% rename from Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl index 76fcad1..5e49015 100644 --- a/Lib/ensurepip/_bundled/pip-7.1.0-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl Binary files differ
diff --git a/Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl similarity index 92% rename from Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl rename to Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl index 67aaca5..f4288d6 100644 --- a/Lib/ensurepip/_bundled/setuptools-18.0.1-py2.py3-none-any.whl +++ b/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl Binary files differ