summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-11-19 13:07:16 (GMT)
committerDonald Stufft <donald@stufft.io>2018-11-19 13:07:16 (GMT)
commitf4b26f7b0440eec7d2498aea9c3603b9247dee0a (patch)
treee9ddbb2b98f5be24edd9e7b59d000f95f04ba503
parent8945017be4cc9527767bb66673e73e28e4b0b4d3 (diff)
downloadcpython-f4b26f7b0440eec7d2498aea9c3603b9247dee0a.zip
cpython-f4b26f7b0440eec7d2498aea9c3603b9247dee0a.tar.gz
cpython-f4b26f7b0440eec7d2498aea9c3603b9247dee0a.tar.bz2
Upgrade pip to 18.1 and setuptools to 40.6.2 (GH-10598)
(cherry picked from commit 8b9c33ea9ce902f902c9d9900121010801950547) Co-authored-by: Donald Stufft <donald@stufft.io>
-rw-r--r--Lib/ensurepip/__init__.py4
-rw-r--r--Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whlbin1307639 -> 0 bytes
-rw-r--r--Lib/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whlbin0 -> 1323545 bytes
-rw-r--r--Lib/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl (renamed from Lib/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl)bin569436 -> 573107 bytes
-rw-r--r--Misc/NEWS.d/next/Library/2018-11-19-07-22-04.bpo-35277.dsD-2E.rst1
5 files changed, 3 insertions, 2 deletions
diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 4748ba4..09c572d 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@ import tempfile
__all__ = ["version", "bootstrap"]
-_SETUPTOOLS_VERSION = "39.0.1"
+_SETUPTOOLS_VERSION = "40.6.2"
-_PIP_VERSION = "10.0.1"
+_PIP_VERSION = "18.1"
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION),
diff --git a/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl
deleted file mode 100644
index 9837092..0000000
--- a/Lib/ensurepip/_bundled/pip-10.0.1-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/Lib/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl
new file mode 100644
index 0000000..c3c146f
--- /dev/null
+++ b/Lib/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl
Binary files differ
diff --git a/Lib/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl
index edc3ca2..4c8a619 100644
--- a/Lib/ensurepip/_bundled/setuptools-39.0.1-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl
Binary files differ
diff --git a/Misc/NEWS.d/next/Library/2018-11-19-07-22-04.bpo-35277.dsD-2E.rst b/Misc/NEWS.d/next/Library/2018-11-19-07-22-04.bpo-35277.dsD-2E.rst
new file mode 100644
index 0000000..ff76988
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-11-19-07-22-04.bpo-35277.dsD-2E.rst
@@ -0,0 +1 @@
+Update ensurepip to install pip 18.1 and setuptools 40.6.2.