From 945ca4c1326bdc353cf99210789f7b6c5ac870b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 10 May 2022 15:49:29 +0200 Subject: [PATCH] Adhere to PEP 685 when evaluating markers with extras PEP: https://peps.python.org/pep-0685/ Original problem: https://discuss.python.org/t/7614 --- packaging/markers.py | 20 ++++++++++++++++++-- tests/test_markers.py | 8 ++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/packaging/markers.py b/packaging/markers.py index 39905148..03d8cdef 100644 --- a/packaging/markers.py +++ b/packaging/markers.py @@ -21,6 +21,7 @@ ) from .specifiers import InvalidSpecifier, Specifier +from .utils import canonicalize_name __all__ = [ "InvalidMarker", @@ -219,6 +220,18 @@ def _get_env(environment: Dict[str, str], name: str) -> str: return value +def _normalize(*values: str, key: str) -> Tuple[str, ...]: + # PEP 685 – Comparison of extra names for optional distribution dependencies + # https://peps.python.org/pep-0685/ + # > When comparing extra names, tools MUST normalize the names being + # > compared using the semantics outlined in PEP 503 for names + if key == "extra": + return tuple(canonicalize_name(v) for v in values) + + # other environment markes don't have such standards + return values + + def _evaluate_markers(markers: List[Any], environment: Dict[str, str]) -> bool: groups: List[List[bool]] = [[]] @@ -231,12 +244,15 @@ def _evaluate_markers(markers: List[Any], environment: Dict[str, str]) -> bool: lhs, op, rhs = marker if isinstance(lhs, Variable): - lhs_value = _get_env(environment, lhs.value) + environment_key = lhs.value + lhs_value = _get_env(environment, environment_key) rhs_value = rhs.value else: lhs_value = lhs.value - rhs_value = _get_env(environment, rhs.value) + environment_key = rhs.value + rhs_value = _get_env(environment, environment_key) + lhs_value, rhs_value = _normalize(lhs_value, rhs_value, key=environment_key) groups[-1].append(_eval_op(lhs_value, op, rhs_value)) else: assert marker in ["and", "or"] diff --git a/tests/test_markers.py b/tests/test_markers.py index 0a16ff27..b1ccf63c 100644 --- a/tests/test_markers.py +++ b/tests/test_markers.py @@ -292,6 +292,14 @@ def test_extra_with_no_extra_in_environment(self): ), ("extra == 'security'", {"extra": "quux"}, False), ("extra == 'security'", {"extra": "security"}, True), + ("extra == 'SECURITY'", {"extra": "security"}, True), + ("extra == 'security'", {"extra": "SECURITY"}, True), + ("extra == 'pep-685-norm'", {"extra": "PEP_685...norm"}, True), + ( + "extra == 'Different.punctuation..is...equal'", + {"extra": "different__punctuation_is_EQUAL"}, + True, + ), ], ) def test_evaluates(self, marker_string, environment, expected):