fix: failure to handle extra if env is not empty but does not have extra (pdm-project#1)

* build(pdm): add test settings and expose test script

* fix(markers): ensure `SingleMarker` handling works when environment does not have `extra` but is not empty

Author: noirbizarre

pyproject.toml

@@ -58,6 +58,16 @@ dev = [
     "pytest>=7.4.3",
 ]
 
+[tool.pdm.scripts]
+test = "pytest"
+
+[tool.pytest.ini_options]
+addopts = "-ra"
+testpaths = [
+  "src/",
+  "tests/",
+]
+
 [tool.pyright]
 venvPath = "."
 venv = ".venv"

src/dep_logic/markers/single.py

@@ -46,7 +46,7 @@ def only(self, *marker_names: str) -> BaseMarker:
 
     def evaluate(self, environment: dict[str, str] | None = None) -> bool:
         pkg_marker = _Marker(str(self))
-        if self.name != "extra" or not environment:
+        if self.name != "extra" or not environment or "extra" not in environment:
             return pkg_marker.evaluate(environment)
         extras = [extra] if isinstance(extra := environment["extra"], str) else extra
         assert isinstance(self, MarkerExpression)

tests/marker/test_evaluation.py

@@ -107,6 +107,8 @@ def test_evaluates(
         # single extra
         ("extra != 'security'", {"extra": "quux"}, True),
         ("extra != 'security'", {"extra": "security"}, False),
+        ("extra != 'security'", {}, True),
+        ("extra != 'security'", {"platform_machine": "x86_64"}, True),
         # normalization
         ("extra == 'Security.1'", {"extra": "security-1"}, True),
         ("extra == 'a'", {}, False),