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

(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 597a1ef9eeaa1223fcbdcaf3e346e32834939b35..b291e9afb189746e693de7867ebaf9588dad8459 100644 (file)
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,11 +8,9 @@ import subprocess
 
 
 __all__ = ["version", "bootstrap"]
-
+_PACKAGE_NAMES = ('setuptools', 'pip')
 _SETUPTOOLS_VERSION = "56.0.0"
-
-_PIP_VERSION = "21.1.1"
-
+_PIP_VERSION = "22.0.4"
 _PROJECTS = [
     ("setuptools", _SETUPTOOLS_VERSION, "py3"),
     ("pip", _PIP_VERSION, "py3"),

diff --git a/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-21.1.1-py3-none-any.whl
deleted file mode 100644 (file)
index 291cc29..0000000
Binary files a/Lib/ensurepip/_bundled/pip-21.1.1-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)