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 09c572db71cb2732f42e394682faef7c1c40121c..526dfd004a41d8daa7492de7a56ddad9627b638b 100644 (file)
--- 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 c3c146f6da272399a19fd6e21364a4f45066cec7..24f247caa0ab432c8c93e9ada0963c2a21d2bffe 100644 (file)
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 4c8a619571d1e50ae8b6b961a4bebc32c90694e1..fdc66e9330e073a68f76b0518910ead9016cc3f7 100644 (file)
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 (file)
index 0000000..1109fbe
--- /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.