fix calculation of override markers when merging override packages

Author: radoering

src/poetry/puzzle/solver.py

@@ -158,7 +158,9 @@ def _solve_in_compatibility_mode(
             new_packages = self._solve()
             override_packages.append((override, new_packages))
 
-        return merge_override_packages(override_packages)
+        return merge_override_packages(
+            override_packages, self._package.python_constraint
+        )
 
     def _solve(self) -> dict[Package, TransitivePackageInfo]:
         if self._provider._overrides:
@@ -419,6 +421,7 @@ def merge_override_packages(
             dict[Package, dict[str, Dependency]], dict[Package, TransitivePackageInfo]
         ]
     ],
+    python_constraint: VersionConstraint,
 ) -> dict[Package, TransitivePackageInfo]:
     result: dict[Package, TransitivePackageInfo] = {}
     all_packages: dict[
@@ -429,6 +432,7 @@ def merge_override_packages(
         for deps in override.values():
             for dep in deps.values():
                 override_marker = override_marker.intersect(dep.marker.without_extras())
+        override_marker = simplify_marker(override_marker, python_constraint)
         for package, info in o_packages.items():
             for group, marker in info.markers.items():
                 # `override_marker` is often a SingleMarker or a MultiMarker,

tests/puzzle/test_solver_internals.py

@@ -2,7 +2,10 @@
 
 from typing import TYPE_CHECKING
 
+import pytest
+
 from packaging.utils import canonicalize_name
+from poetry.core.constraints.version import parse_constraint
 from poetry.core.packages.dependency import Dependency
 from poetry.core.packages.package import Package
 from poetry.core.version.markers import AnyMarker
@@ -378,7 +381,8 @@ def test_merge_override_packages_restricted(package: ProjectPackage) -> None:
                     )
                 },
             ),
-        ]
+        ],
+        parse_constraint("*"),
     )
     assert len(packages) == 1
     assert packages[a].groups == {"main"}
@@ -416,7 +420,8 @@ def test_merge_override_packages_extras(package: ProjectPackage) -> None:
                     )
                 },
             ),
-        ]
+        ],
+        parse_constraint("*"),
     )
     assert len(packages) == 1
     assert packages[a].groups == {"main"}
@@ -428,6 +433,43 @@ def test_merge_override_packages_extras(package: ProjectPackage) -> None:
     }
 
 
+@pytest.mark.parametrize(
+    ("python_constraint", "expected"),
+    [
+        (">=3.8", 'python_version > "3.8" or sys_platform != "linux"'),
+        (">=3.9", ""),
+    ],
+)
+def test_merge_override_packages_python_constraint(
+    package: ProjectPackage, python_constraint: str, expected: str
+) -> None:
+    """The resulting marker depends on the project's python constraint."""
+    a = Package("a", "1")
+
+    packages = merge_override_packages(
+        [
+            (
+                {
+                    package: {
+                        "a": dep(
+                            "b", "sys_platform == 'linux' and python_version > '3.8'"
+                        )
+                    }
+                },
+                {a: TransitivePackageInfo(0, {"main"}, {"main": AnyMarker()})},
+            ),
+            (
+                {package: {"a": dep("b", "sys_platform != 'linux'")}},
+                {a: TransitivePackageInfo(0, {"main"}, {"main": AnyMarker()})},
+            ),
+        ],
+        parse_constraint(python_constraint),
+    )
+    assert len(packages) == 1
+    assert packages[a].groups == {"main"}
+    assert tm(packages[a]) == {"main": expected}
+
+
 def test_merge_override_packages_multiple_deps(package: ProjectPackage) -> None:
     """All override markers should be intersected."""
     a = Package("a", "1")
@@ -444,7 +486,8 @@ def test_merge_override_packages_multiple_deps(package: ProjectPackage) -> None:
                 },
                 {a: TransitivePackageInfo(0, {"main"}, {"main": AnyMarker()})},
             ),
-        ]
+        ],
+        parse_constraint("*"),
     )
 
     assert len(packages) == 1
@@ -492,7 +535,8 @@ def test_merge_override_packages_groups(package: ProjectPackage) -> None:
                     ),
                 },
             ),
-        ]
+        ],
+        parse_constraint("*"),
     )
     assert len(packages) == 2
     assert packages[a].groups == {"main", "dev"}
@@ -552,7 +596,8 @@ def test_merge_override_packages_shortcut(package: ProjectPackage) -> None:
                     )
                 },
             ),
-        ]
+        ],
+        parse_constraint("*"),
     )
     assert len(packages) == 1
     assert packages[a].groups == {"main"}