bpo-46985: Upgrade bundled pip to 22.0.4 (GH-31819) (GH-31852)

(cherry picked from commit d87f1b787ed38dfd307d82452f2efe9dc5b93942)

Co-authored-by: Pradyun Gedam <pgedam@bloomberg.net>

diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py
index 94d40b0c8d010d48211d249b734ce5a5483f3e68..8289c495d36895fe8590161b7319455464a5be8e 100644 (file)
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -7,15 +7,12 @@ import tempfile
 
 
 __all__ = ["version", "bootstrap"]
-
-
+_PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "47.1.0"
-
-_PIP_VERSION = "20.1.1"
-
+_PIP_VERSION = "22.0.4"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
-    ("pip", _PIP_VERSION, "py2.py3"),
+    ("pip", _PIP_VERSION, "py3"),
 ]
 
 

diff --git a/Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl b/Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl
deleted file mode 100644 (file)
index ea1d0f7..0000000
Binary files a/Lib/ensurepip/_bundled/pip-20.1.1-py2.py3-none-any.whl and /dev/null differ

diff --git a/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl
new file mode 100644 (file)
index 0000000..7ba048e
Binary files /dev/null and b/Lib/ensurepip/_bundled/pip-22.0.4-py3-none-any.whl differ

diff --git a/Misc/NEWS.d/next/Library/2022-03-11-13-34-16.bpo-46985.BgoMr2.rst b/Misc/NEWS.d/next/Library/2022-03-11-13-34-16.bpo-46985.BgoMr2.rst
new file mode 100644 (file)
index 0000000..2e08ee8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-03-11-13-34-16.bpo-46985.BgoMr2.rst
@@ -0,0 +1 @@
+Upgrade pip wheel bundled with ensurepip (pip 22.0.4)