summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2016-01-20 01:14:39 (GMT)
committerDonald Stufft <donald@stufft.io>2016-01-20 01:14:39 (GMT)
commit1dce2c72edbafa4ef873a30142c3f955e108bc82 (patch)
tree4f5595367beeaccb60815b62e8ad27b1ed95edc3
parentd205d0145c8f5a37d0a46261eb0193e27b5b0ad8 (diff)
parent33a827678ea71b3586c8a60d76b8158ec4ac6f78 (diff)
downloadcpython-1dce2c72edbafa4ef873a30142c3f955e108bc82.zip
cpython-1dce2c72edbafa4ef873a30142c3f955e108bc82.tar.gz
cpython-1dce2c72edbafa4ef873a30142c3f955e108bc82.tar.bz2
Merge update to pip/setuptools
-rw-r--r--Lib/ensurepip/__init__.py4
-rw-r--r--Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl)bin1111358 -> 1188709 bytes
-rw-r--r--Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl)bin461713 -> 471943 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 1258833..b293c72 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@ import tempfile
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "18.2"
+_SETUPTOOLS_VERSION = "19.4"
-_PIP_VERSION = "7.1.2"
+_PIP_VERSION = "8.0.0"
# 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.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl
index 5e49015..4e685be 100644
--- a/Lib/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-8.0.0-py2.py3-none-any.whl
Binary files differ
diff --git a/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl
index f4288d6..b58455f 100644
--- a/Lib/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-19.4-py2.py3-none-any.whl
Binary files differ