Merge branch 'eclipse-score:main' into vohae_saf_analysis

Author: PandaeDo

.github/workflows/format.yml

@@ -23,8 +23,18 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.2
-      - name: Setup Bazel
-        uses: bazel-contrib/setup-bazel@0.9.1
+      - name: Cache Bazel
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/bazel
+          key: ${{ runner.os }}-format-${{ hashFiles('**/*.bazel', '**/BUILD', '**/*.bzl') }}
+
+      - name: Setup Bazel with cache
+        uses: bazel-contrib/setup-bazel@0.15.0
+        with:
+          disk-cache: true
+          repository-cache: true
+          bazelisk-cache: true
       - name: Run formatting checks
         run: |
           bazel run //src:ide_support

.github/workflows/test.yml

@@ -21,6 +21,20 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.2
+      - name: Cache Bazel and pip
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/bazel
+            ~/.cache/pip
+          key: ${{ runner.os }}-test-${{ hashFiles('**/*.bazel', '**/BUILD', '**/*.bzl', 'src/requirements.txt', 'src/**/*.py') }}
+
+      - name: Setup Bazel with cache
+        uses: bazel-contrib/setup-bazel@0.15.0
+        with:
+          disk-cache: true
+          repository-cache: true
+          bazelisk-cache: true
       - name: Run test targets
         run: |
           bazel run //src:ide_support

.vscode/settings.json

@@ -26,7 +26,7 @@
   "python.testing.pytestArgs": [
     ".",
     "--ignore-glob=bazel-*/*",
-    "--ignore-glob=.venv_docs/*",
+    "--ignore-glob=.venv*/*",
     "--ignore-glob=_build/*"
   ],
   "python.testing.unittestEnabled": false,

MODULE.bazel

@@ -13,7 +13,7 @@
 
 module(
     name = "score_docs_as_code",
-    version = "0.3.3",
+    version = "0.4.0",
     compatibility_level = 0,
 )
 
@@ -22,7 +22,7 @@ module(
 # Packaging dependencies
 #
 ###############################################################################
-bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "rules_pkg", version = "1.1.0")
 
 ###############################################################################
 #
@@ -58,17 +58,17 @@ use_repo(pip, "pip_process")
 
 # Additional Python rules provided by aspect, e.g. an improved version of
 bazel_dep(name = "aspect_rules_py", version = "1.4.0")
-bazel_dep(name = "buildifier_prebuilt", version = "7.3.1")
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
 
 ###############################################################################
 #
 # Generic linting and formatting rules
 #
 ###############################################################################
-bazel_dep(name = "aspect_rules_lint", version = "1.4.2")
+bazel_dep(name = "aspect_rules_lint", version = "1.4.4")
 
 # PlantUML for docs
-bazel_dep(name = "rules_java", version = "8.11.0")
+bazel_dep(name = "rules_java", version = "8.13.0")
 
 http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
 
@@ -94,8 +94,7 @@ bazel_dep(name = "score_python_basics", version = "0.3.2")
 bazel_dep(name = "score_cr_checker", version = "0.2.2")
 
 # This is only needed to build the examples.
-bazel_dep(name = "score_platform", version = "0.1.1")
 
 # Grab dash
 bazel_dep(name = "score_dash_license_checker", version = "0.1.1")
-bazel_dep(name = "score_process", version = "0.2.0")
+bazel_dep(name = "score_process", version = "1.0.2")

docs/BUILD

@@ -26,11 +26,6 @@ docs(
         {
             "suffix": "latest",  # latest main branch documentation build
             "external_needs_info": [
-                {
-                    "base_url": "https://eclipse-score.github.io/score/main",
-                    "json_url": "https://eclipse-score.github.io/score/main/needs.json",
-                    "id_prefix": "score_",
-                },
                 {
                     "base_url": "https://eclipse-score.github.io/process_description/main",
                     "json_url": "https://eclipse-score.github.io/process_description/main/needs.json",
@@ -41,15 +36,9 @@ docs(
         {
             "suffix": "release",  # The version imported from MODULE.bazel
             "target": [
-                "@score_platform//docs:docs_needs",
                 "@score_process//process:docs_needs_latest",
             ],
             "external_needs_info": [
-                {
-                    "base_url": "https://eclipse-score.github.io/score/main",
-                    "json_path": "/score_platform~/docs/docs_needs/_build/needs/needs.json",
-                    "id_prefix": "score_",
-                },
                 {
                     "base_url": "https://eclipse-score.github.io/process_description/main",
                     "json_path": "/score_process~/process/docs_needs_latest/_build/needs/needs.json",

docs/how-to-integrate/example/index.rst

@@ -30,21 +30,21 @@ This is a rendered example of the 'examples/linking-both' folder using the `docs
 
    Some content to make sure we also can render this
    This is a link to an external need inside the 'score' documentation.
-   :need:`SCORE_feat_req__persistency__config_file`.
+   :need:`PROCESS_gd_req__req__attr_uid`.
    Note how it starts with the defined prefix but in UPPERCASE. This comes from sphinx-needs, `see here <https://github.com/useblocks/sphinx-needs/blob/master/sphinx_needs/external_needs.py#L119>`_
 
 
 
-.. feat_req:: Some Title
-   :id: feat_req__example__some_title
+.. tool_req:: Some Title
+   :id: tool_req__example__some_title
    :reqtype: Process
    :security: YES
    :safety: ASIL_D
-   :satisfies: SCORE_stkh_req__overall_goals__reuse_of_app_soft
+   :satisfies: PROCESS_gd_req__req__attr_uid
    :status: invalid
 
    With this requirement we can check if the removal of the prefix is working correctly.
-   It should remove id_prefix (SCORE _) as it's defined inside the BUILD file and remove it before it checks the leftover value
+   It should remove id_prefix (PROCESS _) as it's defined inside the BUILD file and remove it before it checks the leftover value
    against the allowed defined regex in the metamodel
    Note: The ID is different here as the 'folder structure' is as well
 

docs/how-to-integrate/example/testing/index.rst

@@ -25,18 +25,18 @@ This example will help catch things and bugs when rst's are defined inside a fol
 
    Some content to make sure we also can render this.
    This is a link to an external need inside the 'score' documentation.
-   :need:`SCORE_feat_req__persistency__config_file`.
+   :need:`PROCESS_gd_req__req__attr_uid`
    Note how it starts with the defined prefix but in UPPERCASE. This comes from sphinx-needs, `see here <https://github.com/useblocks/sphinx-needs/blob/master/sphinx_needs/external_needs.py#L119>`_
 
 
-.. feat_req:: Some Title
-   :id: feat_req__testing__some_title
+.. tool_req:: Some Title
+   :id: tool_req__testing__some_title
    :reqtype: Process
    :security: YES
    :safety: ASIL_D
-   :satisfies: SCORE_stkh_req__overall_goals__reuse_of_app_soft
+   :satisfies: PROCESS_gd_req__req__attr_uid
    :status: invalid
 
    With this requirement we can check if the removal of the prefix is working correctly.
-   It should remove id_prefix (SCORE _) as it's defined inside the BUILD file and remove it before it checks the leftover value
+   It should remove id_prefix (PROCESS _) as it's defined inside the BUILD file and remove it before it checks the leftover value
    against the 'allowed' defined regex in the metamodel