summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2016-11-02 19:55:26 (GMT)
committerDonald Stufft <donald@stufft.io>2016-11-02 19:55:26 (GMT)
commit629dda51471e0bb246d0fa0039ae4ec1cd92d729 (patch)
tree981afbaa8b6bc9320985e86114b9a2a1068e900e
parent339dff39e58f505b377f421f96ba73458138834d (diff)
parentf81d60ba68eb40bbae0339d55d5722706c57a6c7 (diff)
downloadcpython-629dda51471e0bb246d0fa0039ae4ec1cd92d729.zip
cpython-629dda51471e0bb246d0fa0039ae4ec1cd92d729.tar.gz
cpython-629dda51471e0bb246d0fa0039ae4ec1cd92d729.tar.bz2
Merge updated pip/setuptools from 3.6
-rw-r--r--Lib/ensurepip/__init__.py4
-rw-r--r--Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whlbin1198961 -> 0 bytes
-rw-r--r--Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whlbin0 -> 1254648 bytes
-rw-r--r--Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl)bin464973 -> 472493 bytes
4 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index fee1004d..68853ef 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@ import tempfile
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "27.1.2"
+_SETUPTOOLS_VERSION = "28.7.1"
-_PIP_VERSION = "8.1.2"
+_PIP_VERSION = "9.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-8.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl
deleted file mode 100644
index cc49227..0000000
--- a/Lib/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl
new file mode 100644
index 0000000..2c631a8
--- /dev/null
+++ b/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl
Binary files differ
diff --git a/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl
index de213bb..cbcc220 100644
--- a/Lib/ensurepip/_bundled/setuptools-27.1.2-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl
Binary files differ