Merge pull request #293 from dimbleby/another-marker-simplification

improve detection of Any marker union
python-poetry · Feb 26, 2022 · 7b8f8b0 · 7b8f8b0
2 parents 8ce6c6c + 31e056f
commit 7b8f8b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/poetry/core/version/markers.py b/src/poetry/core/version/markers.py
@@ -561,7 +561,7 @@ def of(cls, *markers: BaseMarker) -> MarkerTypes:
                 continue
 
             if isinstance(marker, SingleMarker) and marker.name == "python_version":
-                intersected = False
+                included = False
                 for i, mark in enumerate(markers):
                     if (
                         not isinstance(mark, SingleMarker)
@@ -570,16 +570,18 @@ def of(cls, *markers: BaseMarker) -> MarkerTypes:
                     ):
                         continue
 
-                    intersection = mark.constraint.union(marker.constraint)
-                    if intersection == mark.constraint:
-                        intersected = True
+                    union = mark.constraint.union(marker.constraint)
+                    if union == mark.constraint:
+                        included = True
                         break
-                    elif intersection == marker.constraint:
+                    elif union == marker.constraint:
                         markers[i] = marker
-                        intersected = True
+                        included = True
                         break
+                    elif union.is_any():
+                        return AnyMarker()
 
-                if intersected:
+                if included:
                     continue
 
             markers.append(marker)

diff --git a/tests/version/test_markers.py b/tests/version/test_markers.py
@@ -162,16 +162,13 @@ def test_single_marker_not_in_python_intersection():
 def test_single_marker_union():
     m = parse_marker('sys_platform == "darwin"')
 
-    intersection = m.union(parse_marker('implementation_name == "cpython"'))
-    assert (
-        str(intersection)
-        == 'sys_platform == "darwin" or implementation_name == "cpython"'
-    )
+    union = m.union(parse_marker('implementation_name == "cpython"'))
+    assert str(union) == 'sys_platform == "darwin" or implementation_name == "cpython"'
 
     m = parse_marker('python_version >= "3.4"')
 
-    intersection = m.union(parse_marker('python_version < "3.6"'))
-    assert str(intersection) == 'python_version >= "3.4" or python_version < "3.6"'
+    union = m.union(parse_marker('python_version < "3.6"'))
+    assert union.is_any()
 
 
 def test_single_marker_union_compacts_constraints():