update

Author: chrisjsewell

sphinx_needs/data.py

@@ -462,7 +462,7 @@ class NeedsInfoType(TypedDict):
 
     # constraints information
     # set in process_need_nodes (-> process_constraints) transform
-    constraints_results: dict[str, dict[str, bool]]
+    constraints_results: Mapping[str, dict[str, bool]]
     """Mapping of constraint name, to check name, to result."""
     constraints_error: None | str
     """An error message set if any constraint failed, and `error_message` field is set in config."""

sphinx_needs/need_constraints.py

@@ -25,9 +25,8 @@ def process_constraints(needs: NeedsMutable, config: NeedsSphinxConfig) -> None:
 
     for need in needs.values():
         need_id = need["id"]
-        constraints = need["constraints"]
 
-        for constraint in constraints:
+        for constraint in need["constraints_results"]:
             try:
                 executable_constraints = config_constraints[constraint]
             except KeyError:
@@ -43,9 +42,7 @@ def process_constraints(needs: NeedsMutable, config: NeedsSphinxConfig) -> None:
                 # compile constraint and check if need fulfils it
                 constraint_passed = filter_single_need(need, config, cmd)
 
-                need["constraints_results"].setdefault(constraint, {})[name] = (
-                    constraint_passed
-                )
+                need["constraints_results"][constraint][name] = constraint_passed
                 if not constraint_passed:
                     if "error_message" in executable_constraints:
                         msg = str(executable_constraints["error_message"])

tests/test_data.py

@@ -67,7 +67,7 @@ def test_consistent():
         elif type_str == "dict[str, str]":
             assert schema["type"] == "object", field
             assert schema["additionalProperties"]["type"] == "string", field
-        elif type_str.startswith("dict["):
+        elif type_str.startswith("dict[") or type_str.startswith("Mapping["):
             assert schema["type"] == "object", field
         else:
             raise ValueError(f"Unknown type: {type_str!r} for {field!r}")