From 9b686fa73d888ef792009858f8d97e10bb1c74f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 25 Jun 2024 19:40:50 +0200 Subject: [PATCH 1/5] Add missing `pyproject_hooks` to DEBUNDLED preload list Otherwise, tests fail to load: ``` ImportError while loading conftest '/tmp/portage/dev-python/pip-24.1-r1/work/pip-24.1/tests/conftest.py'. tests/conftest.py:49: in from pip._internal.utils.temp_dir import global_tempdir_manager ../pip-24.1-python3_13/install/usr/lib/python3.13/site-packages/pip/_internal/utils/temp_dir.py:20: in from pip._internal.utils.misc import enum, rmtree ../pip-24.1-python3_13/install/usr/lib/python3.13/site-packages/pip/_internal/utils/misc.py:38: in from pip._vendor.pyproject_hooks import BuildBackendHookCaller E ModuleNotFoundError: No module named 'pip._vendor.pyproject_hooks' ``` --- src/pip/_vendor/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py index 50537ab9de1..3c5c23591e1 100644 --- a/src/pip/_vendor/__init__.py +++ b/src/pip/_vendor/__init__.py @@ -69,6 +69,7 @@ def vendored(modulename): vendored("pkg_resources") vendored("platformdirs") vendored("progress") + vendored("pyproject_hooks") vendored("requests") vendored("requests.exceptions") vendored("requests.packages") From a866308712f53780095f27d6d02fe4f25571b759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 26 Jun 2024 02:52:32 +0200 Subject: [PATCH 2/5] Remove `pep517` from DEBUNDLED preload list --- src/pip/_vendor/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py index 3c5c23591e1..4d3db37a6d2 100644 --- a/src/pip/_vendor/__init__.py +++ b/src/pip/_vendor/__init__.py @@ -65,7 +65,6 @@ def vendored(modulename): vendored("packaging") vendored("packaging.version") vendored("packaging.specifiers") - vendored("pep517") vendored("pkg_resources") vendored("platformdirs") vendored("progress") From 2c107ebf958a8936f5f6bd1693a55f85659e5e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 28 Jun 2024 15:56:48 +0200 Subject: [PATCH 3/5] Add a news item for DEBUNDLED list update --- news/12796.vendor.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/12796.vendor.rst diff --git a/news/12796.vendor.rst b/news/12796.vendor.rst new file mode 100644 index 00000000000..2b2fe126cfd --- /dev/null +++ b/news/12796.vendor.rst @@ -0,0 +1 @@ +Update the preload list for the ``DEBUNDLED`` case. From 27bcb46d51e80b1e39b94da67a7dd9dfd4aa6b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 1 Jul 2024 10:33:16 +0000 Subject: [PATCH 4/5] Update the news item per suggestion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphane Bidoul --- news/12796.vendor.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/12796.vendor.rst b/news/12796.vendor.rst index 2b2fe126cfd..c8d63920d11 100644 --- a/news/12796.vendor.rst +++ b/news/12796.vendor.rst @@ -1 +1 @@ -Update the preload list for the ``DEBUNDLED`` case. +Update the preload list for the ``DEBUNDLED`` case, to replace `pep517` that has been renamed to `pyproject_hooks`. From cc0c381b09a6f28c9440ba4250c3a8cd85d336b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 2 Jul 2024 08:23:23 +0200 Subject: [PATCH 5/5] Fix code tags in the news item --- news/12796.vendor.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/12796.vendor.rst b/news/12796.vendor.rst index c8d63920d11..6384a5b1476 100644 --- a/news/12796.vendor.rst +++ b/news/12796.vendor.rst @@ -1 +1 @@ -Update the preload list for the ``DEBUNDLED`` case, to replace `pep517` that has been renamed to `pyproject_hooks`. +Update the preload list for the ``DEBUNDLED`` case, to replace ``pep517`` that has been renamed to ``pyproject_hooks``.