String cmp

Author: npapapietro

src/poetry/core/version/markers.py

@@ -322,7 +322,10 @@ class SingleMarker(SingleMarkerLike[Union[BaseConstraint, VersionConstraint]]):
     }
 
     def __init__(
-        self, name: str, constraint: str | BaseConstraint | VersionConstraint
+        self,
+        name: str,
+        constraint: str | BaseConstraint | VersionConstraint,
+        str_cmp: bool = False,
     ) -> None:
         from poetry.core.constraints.generic import (
             parse_constraint as parse_generic_constraint,
@@ -345,7 +348,9 @@ def __init__(
         self._value = m.group(2)
         parser = parse_generic_constraint
 
-        if name in self._VERSION_LIKE_MARKER_NAME:
+        if name in self._VERSION_LIKE_MARKER_NAME and not (
+            name == "platform_release" and str_cmp
+        ):
             parser = parse_marker_version_constraint
 
             if self._operator in {"in", "not in"}:
@@ -901,11 +906,12 @@ def _compact_markers(
 
         elif token.data == f"{tree_prefix}item":
             name, op, value = token.children
-            if value.type == f"{tree_prefix}MARKER_NAME":
+            str_cmp = value.type == f"{tree_prefix}MARKER_NAME"
+            if str_cmp:
                 name, value = value, name
 
             value = value[1:-1]
-            sub_marker = SingleMarker(str(name), f"{op}{value}")
+            sub_marker = SingleMarker(str(name), f"{op}{value}", str_cmp=str_cmp)
             groups[-1].append(sub_marker)
 
         elif token.data == f"{tree_prefix}BOOL_OP" and token.children[0] == "or":

tests/version/test_markers.py

@@ -916,19 +916,24 @@ def test_multi_marker_removes_duplicates() -> None:
         ("sys.platform == 'win32'", {"sys_platform": "linux2"}, False),
         ("platform.version in 'Ubuntu'", {"platform_version": "#39"}, False),
         ("platform.machine=='x86_64'", {"platform_machine": "x86_64"}, True),
-        ('"tegra" in platform_machine', {"platform_machine": "5.10.120-tegra"}, True),
-        ('"tegra" in platform_machine', {"platform_machine": "5.10.120"}, False),
+        ('"tegra" in platform_release', {"platform_release": "5.10.120-tegra"}, True),
+        ('"tegra" in platform_release', {"platform_release": "5.10.120"}, False),
         (
-            '"tegra" not in platform_machine',
-            {"platform_machine": "5.10.120-tegra"},
+            '"tegra" not in platform_release',
+            {"platform_release": "5.10.120-tegra"},
             False,
         ),
-        ('"tegra" not in platform_machine', {"platform_machine": "5.10.120"}, True),
+        ('"tegra" not in platform_release', {"platform_release": "5.10.120"}, True),
         (
             "platform_release != '4.9.253-tegra'",
             {"platform_release": "4.9.254-tegra"},
             True,
         ),
+        (
+            "platform_release >= '6.6.0+rpt-rpi-v8'",
+            {"platform_release": "6.6.20+rpt-rpi-v8"},
+            True,
+        ),
         (
             "platform_release < '5.10.123-tegra' and platform_release >= '4.9.254-tegra'",
             {"platform_release": "4.9.254-tegra"},