From 40eef24e130a6897419bfbead36081d2595d0c82 Mon Sep 17 00:00:00 2001 From: Andreas Zwinkau Date: Fri, 21 Aug 2026 16:11:04 +0200 Subject: [PATCH 1/2] chore: update to process 2.1.0 It got renamed to process_description. --- .../instructions/process_req.instructions.md | 2 +- BUILD | 2 +- MODULE.bazel | 2 +- MODULE.bazel.lock | 4 ++-- docs.bzl | 2 +- docs/how-to/mounts/index.rst | 2 +- docs/how-to/other_modules.rst | 6 ++--- docs/how-to/source_to_doc_links.rst | 2 +- docs/reference/bazel_macros.rst | 2 +- src/extensions/score_mounts/__init__.py | 10 ++++----- .../score_mounts/tests/test_resolver.py | 22 +++++++++---------- src/extensions/score_sync_toml/test_mounts.py | 4 ++-- .../docs_bzl/scenarios/external_bundle/BUILD | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/instructions/process_req.instructions.md b/.github/instructions/process_req.instructions.md index 803ca785d..437298ff1 100644 --- a/.github/instructions/process_req.instructions.md +++ b/.github/instructions/process_req.instructions.md @@ -16,7 +16,7 @@ applyTo: "docs/requirements/requirements.rst" --- This file contains docs-as-code requirements which derived from upstream process requirements. -Those are specified in `bazel-out/k8-fastbuild/bin/external/score_process+/needs_json/_build/needs/needs.json` +Those are specified in `bazel-out/k8-fastbuild/bin/external/score_process_description+/needs_json/_build/needs/needs.json` The docs-as-code requirements are implemented in this repository, most notably in `src/extensions/score_metamodel/metamodel.yaml` The metamodel has references to docs-as-code requirement ids. diff --git a/BUILD b/BUILD index 34d7a5e70..bb79832c2 100644 --- a/BUILD +++ b/BUILD @@ -23,7 +23,7 @@ docs( project = "S-CORE Docs-as-Code", project_url = "https://eclipse-score.github.io/docs-as-code", external_needs = [ - "@score_process//:needs_json_file", + "@score_process_description//:needs_json_file", ], bundles = [ { diff --git a/MODULE.bazel b/MODULE.bazel index 9f05134e0..55aa87a15 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -70,7 +70,7 @@ http_file( urls = ["https://github.com/withered-magic/starpls/releases/download/v0.1.21/starpls-linux-amd64"], ) -bazel_dep(name = "score_process", version = "2.0.3") +bazel_dep(name = "score_process_description", version = "2.1.0") # Provide the tools from the devcontainer to Bazel bazel_dep(name = "score_devcontainer", version = "1.11.0") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 679232b82..cb383bdc2 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -288,8 +288,8 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_shell/0.4.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.11.0/MODULE.bazel": "fb6041c96e949a151307b4690ee81cf5d9254d6bf79540184b16567b04397171", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.11.0/source.json": "b379a2499cf06f16de65c2981665c3723afba9e858ed16b453f044882067f56f", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.3/MODULE.bazel": "d9359f1cb7e460a5eb6b7e5d2185bcc6ed7c9f4a31f560d6a703549ca6366ed7", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.3/source.json": "0ea635f75ded5225494b709a441488f80be0db0ded4a9786367477ecdbcf42b0", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process_description/2.1.0/MODULE.bazel": "ea125cd27f5177d616e870c259ec760819ea9a576c19005c4a21b37f09857cba", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process_description/2.1.0/source.json": "8883c5449e31c6d552476e6dd664b73ba7c809ea859e2f67e904fd1de624318f", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/sphinxdocs/2.2.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.3/MODULE.bazel": "not found", diff --git a/docs.bzl b/docs.bzl index cdc3a735c..6f902162e 100644 --- a/docs.bzl +++ b/docs.bzl @@ -220,7 +220,7 @@ def docs( "attach_to": , }. Note: a bundle label may also point at another module's auto-exposed - bundle, e.g. "@score_process//:docs_bundle". + bundle, e.g. "@score_process_description//:docs_bundle". """ # HINT: keep documentation sync docs/reference/bazel_macros.rst diff --git a/docs/how-to/mounts/index.rst b/docs/how-to/mounts/index.rst index 40dc20602..996032a4c 100644 --- a/docs/how-to/mounts/index.rst +++ b/docs/how-to/mounts/index.rst @@ -125,7 +125,7 @@ Every project using ``docs()`` exposes its own source directory as docs( bundles = [ { - "bundle": "@score_process//:docs_bundle", + "bundle": "@score_process_description//:docs_bundle", "mount_at": "process", "attach_to": "index", }, diff --git a/docs/how-to/other_modules.rst b/docs/how-to/other_modules.rst index 4b9e88ad2..a50e33127 100644 --- a/docs/how-to/other_modules.rst +++ b/docs/how-to/other_modules.rst @@ -36,7 +36,7 @@ A minimal example (add or extend the existing `bazel_deps` stanza): .. code-block:: starlark - bazel_dep(name = "score_process", version = "1.5.3") + bazel_dep(name = "score_process_description", version = "2.1.0") 2a) Import the other module's built inventory ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -53,7 +53,7 @@ Example `BUILD` snippet (consumer module): load("@score_docs_as_code//:docs.bzl", "docs") docs( external_needs = [ - "@score_process//:needs_json", + "@score_process_description//:needs_json", ], source_dir = "docs", ) @@ -76,7 +76,7 @@ Example `BUILD` snippet (consumer module): docs( bundles = [ { - "bundle": "@score_process//:docs_bundle", + "bundle": "@score_process_description//:docs_bundle", "mount_at": "process", "attach_to": "index", }, diff --git a/docs/how-to/source_to_doc_links.rst b/docs/how-to/source_to_doc_links.rst index 63d3f5def..70292f780 100644 --- a/docs/how-to/source_to_doc_links.rst +++ b/docs/how-to/source_to_doc_links.rst @@ -64,7 +64,7 @@ uses. You may also pass filegroups; their files are scanned directly. docs( data = [ - "@score_process//:needs_json", + "@score_process_description//:needs_json", ], source_dir = "docs", code_targets = [":some_application"], diff --git a/docs/reference/bazel_macros.rst b/docs/reference/bazel_macros.rst index f188c93f5..adef0f43c 100644 --- a/docs/reference/bazel_macros.rst +++ b/docs/reference/bazel_macros.rst @@ -42,7 +42,7 @@ Minimal example (root ``BUILD``) ], bundles = [ # dicts describing bundles to mount into this project - # e.g. {"bundle": "@score_process//:docs_bundle", "mount_at": "process"} + # e.g. {"bundle": "@score_process_description//:docs_bundle", "mount_at": "process"} ], deps = [ # additional bazel labels providing Python deps or other runfiles diff --git a/src/extensions/score_mounts/__init__.py b/src/extensions/score_mounts/__init__.py index 55157f475..2a35673ed 100644 --- a/src/extensions/score_mounts/__init__.py +++ b/src/extensions/score_mounts/__init__.py @@ -113,10 +113,10 @@ def _canonical_mount_dir(walk_dir: Path, spec: MountSpec) -> Path: - for external repositories, the repository directory exists in the action sandbox, for example - ``.../sandbox/.../execroot/_main/external/score_process+/process``; + ``.../sandbox/.../execroot/_main/external/score_process_description+/process``; files inside that directory can be symlinks to Bazel's repository cache, for example - ``~/.cache/bazel/.../external/score_process+/process/index.rst``. + ``~/.cache/bazel/.../external/score_process_description+/process/index.rst``. - for generated data bundles, the mount root may be the sandbox copy of a ``bazel-out`` directory, for example ``.../sandbox/.../execroot/_main/bazel-out/.../docs/generated``; @@ -133,11 +133,11 @@ def _canonical_mount_dir(walk_dir: Path, spec: MountSpec) -> Path: source file first and then walk back by its bundle-relative suffix. Example: ``walk_dir``: - ``.../sandbox/.../external/score_process+/process`` + ``.../sandbox/.../external/score_process_description+/process`` ``source_file``: - ``.../sandbox/.../external/score_process+/process/index.rst`` + ``.../sandbox/.../external/score_process_description+/process/index.rst`` ``source_file.resolve()``: - ``~/.cache/bazel/.../external/score_process+/process/index.rst`` + ``~/.cache/bazel/.../external/score_process_description+/process/index.rst`` Since ``index.rst`` is one path component below ``walk_dir``, its parent is the canonical mount root. For ``subdir/page.rst`` we walk back two diff --git a/src/extensions/score_mounts/tests/test_resolver.py b/src/extensions/score_mounts/tests/test_resolver.py index f01338ff2..b9fe60e5b 100644 --- a/src/extensions/score_mounts/tests/test_resolver.py +++ b/src/extensions/score_mounts/tests/test_resolver.py @@ -91,20 +91,20 @@ def test_external_mount_keeps_execroot_and_runfiles_locations(tmp_path: Path) -> "mount_at": "x", }, { - "src_root": "external/score_process+/docs_as_mount", - "runtime_path": "../score_process+/docs_as_mount", + "src_root": "external/score_process_description+/docs_as_mount", + "runtime_path": "../score_process_description+/docs_as_mount", "mount_at": "process", "external": True, - "repository": "score_process+", + "repository": "score_process_description+", }, ], }, ) specs = load_mounts_manifest(str(manifest)).mounts assert specs[0].src_root == "src/docs" - assert specs[1].src_root == "external/score_process+/docs_as_mount" + assert specs[1].src_root == "external/score_process_description+/docs_as_mount" assert specs[1].external is True - assert specs[1].repository == "score_process+" + assert specs[1].repository == "score_process_description+" def test_load_missing_required_key_raises(tmp_path: Path) -> None: @@ -129,8 +129,8 @@ def test_external_mount_uses_execroot_path_in_sandbox( { "mounts": [ { - "src_root": "external/score_process+/docs_as_mount", - "runtime_path": "../score_process+/docs_as_mount", + "src_root": "external/score_process_description+/docs_as_mount", + "runtime_path": "../score_process_description+/docs_as_mount", "mount_at": "process", "external": True, } @@ -139,7 +139,7 @@ def test_external_mount_uses_execroot_path_in_sandbox( ) spec = load_mounts_manifest(manifest).mounts[0] assert resolve_walk_dir(load_mounts_manifest(manifest), spec, None) == ( - tmp_path / "external" / "score_process+" / "docs_as_mount" + tmp_path / "external" / "score_process_description+" / "docs_as_mount" ) @@ -149,8 +149,8 @@ def test_external_mount_uses_runfiles_root_under_bazel_run(tmp_path: Path) -> No { "mounts": [ { - "src_root": "external/score_process+/docs_as_mount", - "runtime_path": "../score_process+/docs_as_mount", + "src_root": "external/score_process_description+/docs_as_mount", + "runtime_path": "../score_process_description+/docs_as_mount", "mount_at": "process", "external": True, } @@ -163,4 +163,4 @@ def test_external_mount_uses_runfiles_root_under_bazel_run(tmp_path: Path) -> No spec, tmp_path / "workspace", tmp_path, - ) == (tmp_path / "score_process+" / "docs_as_mount") + ) == (tmp_path / "score_process_description+" / "docs_as_mount") diff --git a/src/extensions/score_sync_toml/test_mounts.py b/src/extensions/score_sync_toml/test_mounts.py index 5938e9301..52a299af6 100644 --- a/src/extensions/score_sync_toml/test_mounts.py +++ b/src/extensions/score_sync_toml/test_mounts.py @@ -52,7 +52,7 @@ def test_materialize_mounts_maps_external_runfiles_path_to_bazel_bin( tmp_path: Path, monkeypatch: pytest.MonkeyPatch ) -> None: runfiles_dir = tmp_path / "runfiles" - walk_dir = runfiles_dir / "score_process+" / "process" + walk_dir = runfiles_dir / "score_process_description+" / "process" walk_dir.mkdir(parents=True) monkeypatch.setattr(_mounts, "find_git_root", lambda: None) monkeypatch.setattr(_mounts, "get_runfiles_dir", lambda: runfiles_dir) @@ -68,7 +68,7 @@ def test_materialize_mounts_maps_external_runfiles_path_to_bazel_bin( assert fragment is not None assert fragment.read_text(encoding="utf-8") == ( - '[[mounts]]\ndir = "bazel-bin/external/score_process+/process"\nmount_at = "process"\n' + '[[mounts]]\ndir = "bazel-bin/external/score_process_description+/process"\nmount_at = "process"\n' ) diff --git a/src/tests/docs_bzl/scenarios/external_bundle/BUILD b/src/tests/docs_bzl/scenarios/external_bundle/BUILD index 05e6f9847..5a789d492 100644 --- a/src/tests/docs_bzl/scenarios/external_bundle/BUILD +++ b/src/tests/docs_bzl/scenarios/external_bundle/BUILD @@ -20,7 +20,7 @@ docs( source_dir = "host_docs", test_sources = ["src/tests/docs_bzl/scenarios/external_bundle"], bundles = [{ - "bundle": "@score_process//:docs_bundle", + "bundle": "@score_process_description//:docs_bundle", "mount_at": "process", }], ) From 3d8ad315981fd6c093d0954ad388370398c88d4f Mon Sep 17 00:00:00 2001 From: Andreas Zwinkau Date: Fri, 21 Aug 2026 16:28:38 +0200 Subject: [PATCH 2/2] chore: adapt to process changes --- docs/internals/requirements/requirements.rst | 3 +-- src/extensions/score_metamodel/metamodel.yaml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/internals/requirements/requirements.rst b/docs/internals/requirements/requirements.rst index cec3ee611..c6a158fcd 100644 --- a/docs/internals/requirements/requirements.rst +++ b/docs/internals/requirements/requirements.rst @@ -702,7 +702,7 @@ but for ease of traceability this is a separate one. :id: tool_req__arch_linkage_safety :implemented: YES :version: 2 - :satisfies: gd_req__arch_linkage_safety[version==1], gd_req__arch_build_blocks_corr[version==2] + :satisfies: gd_req__arch_linkage_safety[version==1], gd_req__arch_build_blocks_corr[version==3] :parent_covered: YES .. csv-table:: @@ -717,7 +717,6 @@ but for ease of traceability this is a separate one. comp, consists_of, comp, no real_arc_int_op, included_by, real_arc_int, yes real_arc_int_op, implements, logic_arc_int_op, no - logic_arc_int, includes, logic_arc_int_op, no logic_arc_int_op, included_by, logic_arc_int, yes .. note:: diff --git a/src/extensions/score_metamodel/metamodel.yaml b/src/extensions/score_metamodel/metamodel.yaml index f643690e6..33b088d52 100644 --- a/src/extensions/score_metamodel/metamodel.yaml +++ b/src/extensions/score_metamodel/metamodel.yaml @@ -499,7 +499,6 @@ needs_types: # req-Id: tool_req__arch_linkage_safety # New direction kept optional during migration; will supersede feat includes logic_arc_int included_by: feat - includes: logic_arc_int_op fulfils: feat_req tags: - architecture_element