Find another marker simplification at intersection

python-poetry · May 29, 2022 · dfd1b39 · dfd1b39
1 parent 31d518d
commit dfd1b39
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/poetry/core/version/markers.py b/src/poetry/core/version/markers.py
@@ -433,6 +433,14 @@ def of(cls, *markers: BaseMarker) -> BaseMarker:
                                 intersected = True
                             elif constraint_intersection.is_empty():
                                 return EmptyMarker()
+                            elif (
+                                isinstance(constraint_intersection, VersionConstraint)
+                                and constraint_intersection.is_simple()
+                            ):
+                                new_markers[i] = SingleMarker(
+                                    mark.name, constraint_intersection
+                                )
+                                intersected = True
                         elif isinstance(mark, MarkerUnion):
                             intersection = mark.intersect(marker)
                             if isinstance(intersection, SingleMarker):

diff --git a/tests/version/test_markers.py b/tests/version/test_markers.py
@@ -1176,3 +1176,16 @@ def test_union_should_drop_markers_if_their_complement_is_present(
 )
 def test_dnf(scheme: str, marker: BaseMarker, expected: BaseMarker) -> None:
     assert dnf(marker) == expected
+
+
+def test_single_markers_are_found_in_complex_intersection() -> None:
+    m1 = parse_marker('implementation_name != "pypy" and python_version <= "3.6"')
+    m2 = parse_marker(
+        'python_version >= "3.6" and python_version < "4.0" and implementation_name =='
+        ' "cpython"'
+    )
+    intersection = m1.intersect(m2)
+    assert (
+        str(intersection)
+        == 'implementation_name == "cpython" and python_version == "3.6"'
+    )