summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2016-11-15 21:18:20 -0500
committerDonald Stufft <donald@stufft.io>2016-11-15 21:18:20 -0500
commit5ebff7b300448db36d0d0eda7d265caa06fce6d2 (patch)
tree0d622b56face864bcf8c3357a78ebe3710e34e28
parentd7c151871e4eb445676fbd18bc5cb31406cccdf6 (diff)
parentdd5c73b4f20331c15d2239658bcc17c5c703c370 (diff)
downloadcpython-git-5ebff7b300448db36d0d0eda7d265caa06fce6d2.tar.gz
Merge - upgrade pip/setuptools
-rw-r--r--Lib/ensurepip/__init__.py4
-rw-r--r--Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl)bin1254648 -> 1254803 bytes
-rw-r--r--Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl)bin472493 -> 472830 bytes
3 files changed, 2 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 68853ef012..25c55679a3 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@ import tempfile
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "28.7.1"
+_SETUPTOOLS_VERSION = "28.8.0"
-_PIP_VERSION = "9.0.0"
+_PIP_VERSION = "9.0.1"
# 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-9.0.0-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
index 2c631a846c..4b8ecc69db 100644
--- a/Lib/ensurepip/_bundled/pip-9.0.0-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
Binary files differ
diff --git a/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
index cbcc2200f4..502e3cb418 100644
--- a/Lib/ensurepip/_bundled/setuptools-28.7.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
Binary files differ