From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 8 Mar 2019 21:44:39 +0000 (-0800)
Subject: bpo-35807: Upgrade ensurepip bundled pip and setuptools (GH-12189)
X-Git-Tag: v3.7.3rc1~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=572205adf06fc5afa64984740c4775af45942d5c;p=thirdparty%2FPython%2Fcpython.git

bpo-35807: Upgrade ensurepip bundled pip and setuptools (GH-12189)


* Update pip to 19.0.3
* Update setuptools to 40.8.0
(cherry picked from commit 01e0f439f5009f37b95ab516e91906fcc7fcb8c3)

Co-authored-by: Pradyun Gedam <pradyunsg@gmail.com>
---

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 09c572db71cb..526dfd004a41 100644
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,9 +8,9 @@ import tempfile
 __all__ = ["version", "bootstrap"]
 
 
-_SETUPTOOLS_VERSION = "40.6.2"
+_SETUPTOOLS_VERSION = "40.8.0"
 
-_PIP_VERSION = "18.1"
+_PIP_VERSION = "19.0.3"
 
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION),
diff --git a/Lib/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-19.0.3-py2.py3-none-any.whl
similarity index 50%
rename from Lib/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl
rename to Lib/ensurepip/_bundled/pip-19.0.3-py2.py3-none-any.whl
index c3c146f6da27..24f247caa0ab 100644
Binary files a/Lib/ensurepip/_bundled/pip-18.1-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-19.0.3-py2.py3-none-any.whl differ
diff --git a/Lib/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/setuptools-40.8.0-py2.py3-none-any.whl
similarity index 81%
rename from Lib/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl
rename to Lib/ensurepip/_bundled/setuptools-40.8.0-py2.py3-none-any.whl
index 4c8a619571d1..fdc66e9330e0 100644
Binary files a/Lib/ensurepip/_bundled/setuptools-40.6.2-py2.py3-none-any.whl and b/Lib/ensurepip/_bundled/setuptools-40.8.0-py2.py3-none-any.whl differ
diff --git a/Misc/NEWS.d/next/Library/2019-03-06-13-21-33.bpo-35807.W7mmu3.rst b/Misc/NEWS.d/next/Library/2019-03-06-13-21-33.bpo-35807.W7mmu3.rst
new file mode 100644
index 000000000000..1109fbed3f9c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-03-06-13-21-33.bpo-35807.W7mmu3.rst
@@ -0,0 +1 @@
+Update ensurepip to install pip 19.0.3 and setuptools 40.8.0.