rename relations for SysML compatibility

MODULE.bazel

@@ -19,7 +19,10 @@ module(name = "score_docs_as_code")
 # Python version
 #
 ###############################################################################
-bazel_dep(name = "rules_python", version = "1.8.3")
+bazel_dep(name = "rules_python", version = "2.0.2")
+
+# sphinxdocs was extracted into a separate BCR module starting with rules_python 2.0.0
+bazel_dep(name = "sphinxdocs", version = "2.0.2")
 
 PYTHON_VERSION = "3.12"
 

docs.bzl

@@ -43,7 +43,7 @@ Easy streamlined way for S-CORE docs-as-code.
 
 load("@aspect_rules_py//py:defs.bzl", "py_binary", "py_venv")
 load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
-load("@rules_python//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs")
+load("@sphinxdocs//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs")
 
 def _rewrite_needs_json_to_docs_sources(labels):
     """Replace '@repo//:needs_json' -> '@repo//:docs_sources' for every item."""

src/extensions/score_metamodel/metamodel.yaml

@@ -292,9 +292,15 @@ needs_types:
       status: ^(valid|invalid)$
       # req-Id: tool_req__docs_common_attr_description
       content: ^[\s\S]+$
-    mandatory_links:
+    optional_links:
       # req-Id: tool_req__docs_req_link_satisfies_allowed
-      satisfies: stkh_req
+      # TODO: make derived_from mandatory once downstream repos migrate from satisfies
+      derived_from: stkh_req
+      satisfies: stkh_req # for backward compatibility
+      belongs_to: feat # for evaluation
+      satisfied_by: feat # new preferred name for belongs_to
+      # req-Id: tool_req__docs_req_link_covers_aou
+      covers: aou_req
     optional_options:
       codelink: ^.*$
       testlink: ^.*$
@@ -306,10 +312,6 @@ needs_types:
       # req-Id: tool_req__docs_req_attr_validity_correctness
       valid_from: ^v(0|[1-9]\d*)\.(0|[1-9]\d*)(\.(0|[1-9]\d*))?$
       valid_until: ^v(0|[1-9]\d*)\.(0|[1-9]\d*)(\.(0|[1-9]\d*))?$
-    optional_links:
-      belongs_to: feat # for evaluation
-      # req-Id: tool_req__docs_req_link_covers_aou
-      covers: aou_req
     tags:
       - requirement
       - requirement_excl_process
@@ -329,10 +331,16 @@ needs_types:
       status: ^(valid|invalid)$
       # req-Id: tool_req__docs_common_attr_description
       content: ^[\s\S]+$
-    mandatory_links:
+    optional_links:
       # req-Id: tool_req__docs_req_link_satisfies_allowed
-      satisfies: feat_req
-      belongs_to: comp
+      # TODO: make derived_from mandatory once downstream repos migrate from satisfies
+      derived_from: feat_req
+      satisfies: feat_req # for backward compatibility
+      belongs_to: comp # for backward compatibility
+      satisfied_by: comp # new preferred name for belongs_to
+      # TODO: make satisfied_by mandatory once downstream repos migrate from belongs_to
+      # req-Id: tool_req__docs_req_link_covers_aou
+      covers: aou_req
     optional_options:
       codelink: ^.*$
       testlink: ^.*$
@@ -341,9 +349,6 @@ needs_types:
       # req-Id: tool_req__docs_req_attr_testcov
       testcovered: ^(YES|NO)$
       hash: ^.*$
-    optional_links:
-      # req-Id: tool_req__docs_req_link_covers_aou
-      covers: aou_req
     tags:
       - requirement
       - requirement_excl_process
@@ -986,9 +991,9 @@ needs_extra_links:
   #  S-CORE Metamodel
   ##############################################################
   # Requirements
-  satisfies:
-    incoming: satisfied by
-    outgoing: satisfies
+  derived_from:
+    incoming: derives
+    outgoing: derived from
 
   # req-Id: tool_req__docs_req_link_covers_aou
   covers:
@@ -1004,6 +1009,15 @@ needs_extra_links:
     incoming: has
     outgoing: belongs to
 
+  satisfied_by:
+    incoming: satisfies
+    outgoing: satisfied by
+
+  satisfies:
+    incoming: satisfied by
+    outgoing: satisfies
+
+  # kept for backward compatibility - old name for satisfies
   fulfils:
     incoming: fulfilled by
     outgoing: fulfils
@@ -1067,8 +1081,9 @@ graph_checks:
       include: stkh_req, feat_req, comp_req, aou_req, gd_req, tool_req
       condition: safety == QM
     check:
+      derived_from: safety == QM
       satisfies: safety == QM
-    explanation: QM requirements cannot satisfy ASIL requirements.
+    explanation: QM requirements cannot be derived from ASIL requirements.
 
   # req-Id: tool_req__docs_arch_link_qm_to_safety_req
   tool_req__docs_arch_link_qm_to_safety_req:

src/extensions/score_metamodel/tests/rst/architecture/architecture_tests.rst

@@ -27,7 +27,7 @@
    :reqtype: Process
    :security: YES
    :safety: ASIL_B
-   :satisfies: stkh_req__test_stakeholder_requirement_1__basic_stkh_req
+   :derived_from: stkh_req__test_stakeholder_requirement_1__basic_stkh_req
    :status: invalid
 
    Test Feature Requirement 1
@@ -99,7 +99,7 @@ Component 1
    :reqtype: Process
    :security: YES
    :safety: ASIL_B
-   :satisfies: feat_req__test_feature_1__test_req_1
+   :derived_from: feat_req__test_feature_1__test_req_1
    :status: invalid
 
    Test Component 1 Requirement

src/extensions/score_metamodel/tests/rst/graph/test_metamodel_graph.rst

@@ -36,7 +36,7 @@
 .. feat_req:: Child requirement 1
    :id: feat_req__child__1
    :safety: QM
-   :satisfies: feat_req__parent__QM
+   :derived_from: feat_req__parent__QM
    :status: valid
 
 
@@ -46,22 +46,33 @@
 .. feat_req:: Child requirement 2
    :id: feat_req__child__2
    :safety: ASIL_B
-   :satisfies: feat_req__parent__ASIL_B
+   :derived_from: feat_req__parent__ASIL_B
    :status: valid
 
 
 
 .. Negative Test: Child requirement QM. Parent requirement is `ASIL_B`. Child cant fulfill the safety level of the parent.
-#EXPECT[+2]: QM requirements cannot satisfy ASIL requirements.
+#EXPECT[+2]: QM requirements cannot be derived from ASIL requirements.
 
 .. comp_req:: Child requirement 3
    :id: feat_req__qm_child_with_asil_parent
    :safety: QM
-   :satisfies: feat_req__parent__ASIL_B
+   :derived_from: feat_req__parent__ASIL_B
    :status: valid
 
 
 
+.. Parent requirement does not exist
+#EXPECT[+2]: unknown outgoing link
+
+.. feat_req:: Child requirement 4
+   :id: feat_req__linking_to_unknown_parent
+   :safety: ASIL_B
+   :status: valid
+   :derived_from: feat_req__parent0__abcd
+
+
+
 .. Mitigation of Safety Analysis (FMEA and DFA) shall be checked. Mitigation shall have the same or higher safety level than the analysed item.
 .. Negative Test: Linked to a mitigation that is lower than the safety level of the analysed item.
 #EXPECT[+2]: feat_saf_dfa__child__5: Parent need `feat_req__parent__QM` does not fulfill condition `safety != QM`. Explanation: An ASIL_B safety requirement must link to a ASIL_B requirement. Please ensure that the linked requirements safety level is not QM and it's status is valid.

src/extensions/score_metamodel/tests/rst/options/test_options_options.rst

@@ -46,7 +46,7 @@
 
 .. feat_req:: Child requirement
    :id: feat_req__abcg
-   :satisfies: stkh_req__abcd
+   :derived_from: stkh_req__abcd
 
 .. stkh_req:: Parent requirement
    :id: stkh_req__abcd

src/tests/test_consumer.py

@@ -129,7 +129,7 @@ def _strip_score_docs_overrides(content: str) -> str:
 # ^bazel_dep\(name = ["']score_docs_as_code["']  — literal call with either quote style
 # (?:, version = ["'][^"']+["'])?                 — optional version argument, any value
 # \)                                              — closing paren
-_BAZEL_DEP_PATTERN = r"""^bazel_dep\(name = ["']score_docs_as_code["'](?:, version = ["'][^"']+["'])?\)"""
+_BAZEL_DEP_PATTERN = r"""^bazel_dep\(name = ["']score_docs_as_code["'][^)]*\)"""
 
 
 def _write_module_bazel(