summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2016-11-16 02:18:54 (GMT)
committerDonald Stufft <donald@stufft.io>2016-11-16 02:18:54 (GMT)
commita97872a1fe49a511688a133a3974f0b68fa7edc0 (patch)
treec15cbc812e5afd4a340a43f701003198fe97e4bc
parent22131a3e192921716d5373118d7d54326f7d255e (diff)
parent756b45ab6e0d8d88f985cf449298145244bd317b (diff)
downloadcpython-a97872a1fe49a511688a133a3974f0b68fa7edc0.zip
cpython-a97872a1fe49a511688a133a3974f0b68fa7edc0.tar.gz
cpython-a97872a1fe49a511688a133a3974f0b68fa7edc0.tar.bz2
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 7fd81c4..9f5d151 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"
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
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 2c631a8..4b8ecc6 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 cbcc220..502e3cb 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