remove special cases for setuptools and wheel (#8600)

python-poetry · Nov 1, 2023 · abd993c · abd993c
1 parent a029b36
commit abd993c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/src/poetry/puzzle/transaction.py b/src/poetry/puzzle/transaction.py
@@ -98,14 +98,9 @@ def calculate_operations(
                 result_package_names = {
                     result_package.name for result_package, _ in self._result_packages
                 }
-                # We preserve pip/setuptools/wheel when not managed by poetry, this is
-                # done to avoid externally managed virtual environments causing
-                # unnecessary removals.
-                preserved_package_names = {
-                    "pip",
-                    "setuptools",
-                    "wheel",
-                } - result_package_names
+                # We preserve pip when not managed by poetry, this is done to avoid
+                # externally managed virtual environments causing unnecessary removals.
+                preserved_package_names = {"pip"} - result_package_names
 
                 for installed_package in self._installed_packages:
                     if installed_package.name in uninstalls:

diff --git a/tests/installation/test_installer.py b/tests/installation/test_installer.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import itertools
 import json
 
 from pathlib import Path
@@ -46,8 +45,6 @@
     from tests.conftest import Config
     from tests.types import FixtureDirGetter
 
-RESERVED_PACKAGES = ("pip", "setuptools", "wheel")
-
 
 class Executor(BaseExecutor):
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -628,12 +625,7 @@ def test_run_install_removes_no_longer_locked_packages_if_installed(
 
 @pytest.mark.parametrize(
     "managed_reserved_package_names",
-    itertools.chain(
-        [()],
-        itertools.permutations(RESERVED_PACKAGES, 1),
-        itertools.permutations(RESERVED_PACKAGES, 2),
-        [RESERVED_PACKAGES],
-    ),
+    [(), ("pip",)],
 )
 def test_run_install_with_synchronization(
     managed_reserved_package_names: tuple[str, ...],
@@ -647,16 +639,12 @@ def test_run_install_with_synchronization(
     package_b = get_package("b", "1.1")
     package_c = get_package("c", "1.2")
     package_pip = get_package("pip", "20.0.0")
-    package_setuptools = get_package("setuptools", "20.0.0")
-    package_wheel = get_package("wheel", "20.0.0")
 
     all_packages = [
         package_a,
         package_b,
         package_c,
         package_pip,
-        package_setuptools,
-        package_wheel,
     ]
 
     managed_reserved_packages = [