Merge branch 'main' into feat/generate-sn6-schema-validation

Author: arnoox

MODULE.bazel

@@ -18,13 +18,6 @@ module(
     version = "0.0.0",
 )
 
-###############################################################################
-#
-# Packaging dependencies
-#
-###############################################################################
-bazel_dep(name = "rules_pkg", version = "1.1.0")
-
 ###############################################################################
 #
 # Python version
@@ -51,11 +44,11 @@ pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
 pip.parse(
     envsubst = ["PIP_INDEX_URL"],
     extra_pip_args = ["--index-url=${PIP_INDEX_URL:-https://pypi.org/simple/}"],
-    hub_name = "pip_process",
+    hub_name = "docs_as_code_hub_env",
     python_version = PYTHON_VERSION,
     requirements_lock = "//src:requirements.txt",
 )
-use_repo(pip, "pip_process")
+use_repo(pip, "docs_as_code_hub_env")
 
 # Additional Python rules provided by aspect, e.g. an improved version of
 bazel_dep(name = "aspect_rules_py", version = "1.4.0")
@@ -104,7 +97,7 @@ bazel_dep(name = "score_process", version = "1.4.3")
 
 # Add Linter
 bazel_dep(name = "rules_multitool", version = "1.9.0")
-bazel_dep(name = "score_tooling", version = "1.1.2-RC")
+bazel_dep(name = "score_tooling", version = "1.1.2")
 
 multitool_root = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
 use_repo(multitool_root, "actionlint_hub", "multitool", "ruff_hub", "shellcheck_hub", "yamlfmt_hub")

docs.bzl

@@ -42,8 +42,7 @@ Easy streamlined way for S-CORE docs-as-code.
 # For user-facing documentation, refer to `/README.md`.
 
 load("@aspect_rules_py//py:defs.bzl", "py_binary")
-load("@pip_process//:requirements.bzl", "all_requirements")
-load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
+load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
 load("@rules_python//sphinxdocs:sphinx.bzl", "sphinx_build_binary", "sphinx_docs")
 load("@score_tooling//:defs.bzl", "score_virtualenv")
 load("@score_tooling//bazel/rules/rules_score:rules_score.bzl", "sphinx_module")
@@ -120,7 +119,7 @@ def docs(source_dir = "docs", data = [], deps = [], scan_code = []):
         deps = deps,
     )
 
-    pkg_files(
+    native.filegroup(
         name = "docs_sources",
         srcs = native.glob([
             source_dir + "/**/*.png",
@@ -137,7 +136,6 @@ def docs(source_dir = "docs", data = [], deps = [], scan_code = []):
             source_dir + "/**/*.inc",
             "more_docs/**/*.rst",
         ], allow_empty = True),
-        strip_prefix = strip_prefix.from_pkg(),  # avoid flattening of folders
         visibility = ["//visibility:public"],
     )
 
@@ -259,21 +257,7 @@ def docs(source_dir = "docs", data = [], deps = [], scan_code = []):
 
     sphinx_module(
         name = native.module_name() + "_module",
-        srcs = native.glob([
-            source_dir + "/**/*.rst",
-            source_dir + "/**/*.png",
-            source_dir + "/**/*.svg",
-            source_dir + "/**/*.md",
-            source_dir + "/**/*.html",
-            source_dir + "/**/*.css",
-            source_dir + "/**/*.puml",
-            source_dir + "/**/*.need",
-            source_dir + "/**/*.yaml",
-            source_dir + "/**/*.json",
-            source_dir + "/**/*.csv",
-            source_dir + "/**/*.inc",
-            "more_docs/**/*.rst",
-        ], allow_empty = True),
+        srcs = [":docs_sources"],
         # config = ":" + source_dir + "/conf.py",
         index = source_dir + "/index.rst",
         sphinx = "@score_tooling//bazel/rules/rules_score:score_build",

scripts_bazel/BUILD

@@ -12,7 +12,7 @@
 # *******************************************************************************
 
 load("@aspect_rules_py//py:defs.bzl", "py_binary")
-load("@pip_process//:requirements.bzl", "all_requirements")
+load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
 
 filegroup(
     name = "sources",

scripts_bazel/tests/BUILD

@@ -11,7 +11,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-load("@pip_process//:requirements.bzl", "all_requirements")
+load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
 load("@score_tooling//:defs.bzl", "score_py_pytest")
 
 score_py_pytest(

src/extensions/BUILD

@@ -12,7 +12,7 @@
 # *******************************************************************************
 
 load("@aspect_rules_py//py:defs.bzl", "py_binary", "py_library")
-load("@pip_process//:requirements.bzl", "all_requirements")
+load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
 load("@score_tooling//:defs.bzl", "score_py_pytest", "score_virtualenv")
 
 py_library(

src/extensions/score_draw_uml_funcs/BUILD

@@ -11,7 +11,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 load("@aspect_rules_py//py:defs.bzl", "py_library")
-load("@pip_process//:requirements.bzl", "all_requirements")
+load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
 
 filegroup(
     name = "all_sources",

src/extensions/score_header_service/BUILD

@@ -12,7 +12,7 @@
 # *******************************************************************************
 
 load("@aspect_rules_py//py:defs.bzl", "py_library")
-load("@pip_process//:requirements.bzl", "all_requirements")
+load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
 load("@score_tooling//:defs.bzl", "score_py_pytest")
 
 filegroup(

src/extensions/score_layout/BUILD

@@ -11,7 +11,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 load("@aspect_rules_py//py:defs.bzl", "py_library")
-load("@pip_process//:requirements.bzl", "requirement")
+load("@docs_as_code_hub_env//:requirements.bzl", "requirement")
 
 filegroup(
     name = "all_sources",

src/extensions/score_metamodel/BUILD

@@ -12,7 +12,7 @@
 # *******************************************************************************
 
 load("@aspect_rules_py//py:defs.bzl", "py_library")
-load("@pip_process//:requirements.bzl", "all_requirements")
+load("@docs_as_code_hub_env//:requirements.bzl", "all_requirements")
 load("@score_tooling//:defs.bzl", "score_py_pytest")
 
 filegroup(

src/extensions/score_source_code_linker/testlink.py

@@ -93,7 +93,17 @@ class DataOfTestCase:
 
     @classmethod
     def from_dict(cls, data: dict[str, Any]):  # type-ignore
-        return cls(**data)  # type-ignore
+        return cls(
+            name=data["name"],
+            file=data["file"],
+            line=data["line"],
+            result=data["result"],
+            TestType=data["TestType"],
+            DerivationTechnique=data["DerivationTechnique"],
+            result_text=data["result_text"],
+            PartiallyVerifies=data.get("PartiallyVerifies"),
+            FullyVerifies=data.get("FullyVerifies"),
+        )
 
     @classmethod
     def clean_text(cls, text: str):