Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/extensions/score_metamodel/metamodel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -736,6 +736,7 @@ needs_types:
violates: feat_arc_sta
optional_options:
mitigation_issue: ^https://github.com/.*$
safety_relevant: ^(yes|no)$
optional_links:
mitigated_by: stkh_req, aou_req
parts: 3
Expand All @@ -758,6 +759,7 @@ needs_types:
optional_options:
# req-Id: tool_req__docs_saf_attrs_mitigation_issue
mitigation_issue: ^https://github.com/.*$
safety_relevant: ^(yes|no)$
optional_links:
# req-Id: tool_req__docs_saf_attrs_mitigated_by
# (only mandatory once valid status == valid)
Expand All @@ -782,6 +784,7 @@ needs_types:
optional_options:
# req-Id: tool_req__docs_saf_attrs_mitigation_issue
mitigation_issue: ^https://github.com/.*$
safety_relevant: ^(yes|no)$
mandatory_links:
# req-Id: tool_req__docs_saf_attrs_violates
violates: comp_arc_sta
Expand Down Expand Up @@ -810,6 +813,8 @@ needs_types:
optional_options:
# req-Id: tool_req__docs_saf_attrs_mitigation_issue
mitigation_issue: ^https://github.com/.*$
safety_relevant: ^(yes|no)$
root_cause: ^[\s\S]+$
mandatory_links:
# req-Id: tool_req__docs_saf_attrs_violates
violates: feat_arc_dyn
Expand Down Expand Up @@ -837,6 +842,8 @@ needs_types:
optional_options:
# req-Id: tool_req__docs_saf_attrs_mitigation_issue
mitigation_issue: ^https://github.com/.*$
safety_relevant: ^(yes|no)$
root_cause: ^[\s\S]+$
mandatory_links:
# req-Id: tool_req__docs_saf_attrs_violates
violates: comp_arc_dyn
Expand Down
7 changes: 4 additions & 3 deletions src/tests/test_consumer.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ def filter_repos(repo_filter: str | None) -> list[ConsumerRepo]:

def comment_out_git_override(module_content: str) -> str:
"""
Comment out existing git_override blocks for score_docs_as_code only.
Comment out existing override blocks for score_docs_as_code only.
Handles git_override, single_version_override, local_path_override, archive_override, etc.
"""
lines = module_content.splitlines()
result = []
Expand All @@ -208,8 +209,8 @@ def comment_out_git_override(module_content: str) -> str:
while i < len(lines):
line = lines[i]

# Check if this line starts a git_override block
if re.match(r"^\s*git_override\s*\(", line):
# Check if this line starts any *_override block
if re.match(r"^\s*\w+_override\s*\(", line):
Comment on lines +212 to +213
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good fix but this does not belong into this PR.
Should be a separate one.

# Collect the entire block
block_start = i
depth = line.count("(") - line.count(")")
Expand Down
Loading