From 0d4026dc890f69d1e9bcaa31c50d9ac5c30b8cec Mon Sep 17 00:00:00 2001 From: MaximilianSoerenPollak Date: Thu, 2 Apr 2026 07:37:32 +0200 Subject: [PATCH 1/6] Remove grouped metamodel tool req Removing grouped metamodel tool_req as tool_reqs can not link to tool_reqs. This PR builds upon the PR from @AlexanderLanin #355 --- docs/internals/requirements/requirements.rst | 15 --------------- .../score_metamodel/tests/test_check_options.py | 4 ++-- .../tests/test_metamodel__init__.py | 8 ++++---- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/docs/internals/requirements/requirements.rst b/docs/internals/requirements/requirements.rst index 158d391f6..9c56ff791 100644 --- a/docs/internals/requirements/requirements.rst +++ b/docs/internals/requirements/requirements.rst @@ -1090,17 +1090,6 @@ Overview of Tool to Process Requirements .. ------------------------------------------------------------------------ .. -Grouped Requirements -#################### - -.. tool_req:: Metamodel - :id: tool_req__docs_metamodel - :tags: metamodel - :implemented: YES - - Docs-as-Code shall provide a metamodel for definining config in a `metamodel.yaml` in the source code repository. - - .. note:: "satisfied by" is something like "used by" or "required by". .. needextend:: c.this_doc() and type == 'tool_req' @@ -1109,7 +1098,3 @@ Grouped Requirements .. needextend:: c.this_doc() and type == 'tool_req' and not status :status: valid - -.. needextend:: "metamodel.yaml" in source_code_link - :+satisfies: tool_req__docs_metamodel - :+tags: config diff --git a/src/extensions/score_metamodel/tests/test_check_options.py b/src/extensions/score_metamodel/tests/test_check_options.py index 5e81d64ed..c04296ea5 100644 --- a/src/extensions/score_metamodel/tests/test_check_options.py +++ b/src/extensions/score_metamodel/tests/test_check_options.py @@ -63,7 +63,7 @@ class TestCheckOptions: ] @add_test_properties( - partially_verifies=["tool_req__docs_metamodel"], + partially_verifies=["tool_req__docs_common_attr_description"], test_type="requirements-based", derivation_technique="requirements-analysis", ) @@ -87,7 +87,7 @@ def test_unknown_directive(self): check_options(app, need_1, cast(CheckLogger, logger)) @add_test_properties( - partially_verifies=["tool_req__docs_metamodel"], + partially_verifies=["tool_req__docs_common_attr_description"], test_type="requirements-based", derivation_technique="requirements-analysis", ) diff --git a/src/extensions/score_metamodel/tests/test_metamodel__init__.py b/src/extensions/score_metamodel/tests/test_metamodel__init__.py index 9a2241ed4..f7d36eae0 100644 --- a/src/extensions/score_metamodel/tests/test_metamodel__init__.py +++ b/src/extensions/score_metamodel/tests/test_metamodel__init__.py @@ -43,7 +43,7 @@ def setup_checks(): @add_test_properties( - partially_verifies=["tool_req__docs_metamodel"], + partially_verifies=["tool_req__docs_common_attr_description"], test_type="requirements-based", derivation_technique="requirements-analysis", ) @@ -53,7 +53,7 @@ def test_returns_empty_list_when_filter_is_empty(): @add_test_properties( - partially_verifies=["tool_req__docs_metamodel"], + partially_verifies=["tool_req__docs_common_attr_description"], test_type="requirements-based", derivation_technique="requirements-analysis", ) @@ -64,7 +64,7 @@ def test_returns_valid_checks(): @add_test_properties( - partially_verifies=["tool_req__docs_metamodel"], + partially_verifies=["tool_req__docs_common_attr_description"], test_type="requirements-based", derivation_technique="requirements-analysis", ) @@ -75,7 +75,7 @@ def test_strips_whitespace(): @add_test_properties( - partially_verifies=["tool_req__docs_metamodel"], + partially_verifies=["tool_req__docs_common_attr_description"], test_type="requirements-based", derivation_technique="requirements-analysis", ) From 8180851b8a859ac0f1fe40b2a92ecceaf4fba433 Mon Sep 17 00:00:00 2001 From: MaximilianSoerenPollak Date: Thu, 2 Apr 2026 09:10:52 +0200 Subject: [PATCH 2/6] Switching verifies need --- src/extensions/score_metamodel/tests/test_check_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/score_metamodel/tests/test_check_options.py b/src/extensions/score_metamodel/tests/test_check_options.py index c04296ea5..0e689919a 100644 --- a/src/extensions/score_metamodel/tests/test_check_options.py +++ b/src/extensions/score_metamodel/tests/test_check_options.py @@ -63,7 +63,7 @@ class TestCheckOptions: ] @add_test_properties( - partially_verifies=["tool_req__docs_common_attr_description"], + partially_verifies=["tool_req__docs_common_attr_security"], test_type="requirements-based", derivation_technique="requirements-analysis", ) From 543b9558ba4b8d8c90f1d2782313a4a223ef6316 Mon Sep 17 00:00:00 2001 From: MaximilianSoerenPollak Date: Thu, 2 Apr 2026 14:56:57 +0200 Subject: [PATCH 3/6] Test COmimt --- src/extensions/score_metamodel/tests/test_check_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/score_metamodel/tests/test_check_options.py b/src/extensions/score_metamodel/tests/test_check_options.py index 0e689919a..28b72d90b 100644 --- a/src/extensions/score_metamodel/tests/test_check_options.py +++ b/src/extensions/score_metamodel/tests/test_check_options.py @@ -63,7 +63,7 @@ class TestCheckOptions: ] @add_test_properties( - partially_verifies=["tool_req__docs_common_attr_security"], + partially_verifies=["tool_req__docs_common_attr_securit"], test_type="requirements-based", derivation_technique="requirements-analysis", ) From fe66eee5470e58326170387be323915e9b055d18 Mon Sep 17 00:00:00 2001 From: MaximilianSoerenPollak Date: Thu, 2 Apr 2026 14:57:14 +0200 Subject: [PATCH 4/6] Commit to retrigger CI --- src/extensions/score_metamodel/tests/test_check_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/score_metamodel/tests/test_check_options.py b/src/extensions/score_metamodel/tests/test_check_options.py index 28b72d90b..0e689919a 100644 --- a/src/extensions/score_metamodel/tests/test_check_options.py +++ b/src/extensions/score_metamodel/tests/test_check_options.py @@ -63,7 +63,7 @@ class TestCheckOptions: ] @add_test_properties( - partially_verifies=["tool_req__docs_common_attr_securit"], + partially_verifies=["tool_req__docs_common_attr_security"], test_type="requirements-based", derivation_technique="requirements-analysis", ) From 35f61d3b529e58781466813cd4283907b92440a9 Mon Sep 17 00:00:00 2001 From: MaximilianSoerenPollak Date: Tue, 7 Apr 2026 10:35:31 +0200 Subject: [PATCH 5/6] Changing for CI/CD --- src/extensions/score_metamodel/checks/check_options.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extensions/score_metamodel/checks/check_options.py b/src/extensions/score_metamodel/checks/check_options.py index 5dcc623bf..ee6ef8f7c 100644 --- a/src/extensions/score_metamodel/checks/check_options.py +++ b/src/extensions/score_metamodel/checks/check_options.py @@ -182,8 +182,8 @@ def check_extra_options( ): """ This function checks if the user specified attributes in the need - which are not defined for this element in the metamodel or by default - system attributes. + which are not defined for this element in the metamodel or defined + by default system attributes. """ production_needs_types = app.config.needs_types From 1ee9ca746d44c7fcbc594a149a763e40cdbc1f37 Mon Sep 17 00:00:00 2001 From: MaximilianSoerenPollak Date: Tue, 7 Apr 2026 10:38:03 +0200 Subject: [PATCH 6/6] Formating --- src/extensions/score_metamodel/checks/check_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/score_metamodel/checks/check_options.py b/src/extensions/score_metamodel/checks/check_options.py index ee6ef8f7c..ba7a53bc1 100644 --- a/src/extensions/score_metamodel/checks/check_options.py +++ b/src/extensions/score_metamodel/checks/check_options.py @@ -182,7 +182,7 @@ def check_extra_options( ): """ This function checks if the user specified attributes in the need - which are not defined for this element in the metamodel or defined + which are not defined for this element in the metamodel or defined by default system attributes. """