From 23e720fb0c2dce77db600b5103844b21f575df83 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Wed, 23 Sep 2026 13:01:53 +0000 Subject: [PATCH] chore(deps): bump score_persistency pin, drop obsolete patches Bump the pinned score_persistency commit to eclipse-score/persistency@d2b65ed (merged PR #435), which rewrote the module verification report to use the docs-as-code post_template mechanism natively. - Remove patches/persistency/001-add-mod-need.patch, 002-rename-manual-verification-report-id.patch and 006-add-module-index-title.patch: all three are now applied/obsolete upstream (verified via dry-run patch testing against the new commit). - Keep 003/004/005 (pip/imagefs/googletest not-dev-dependency fixes): regenerated against the new commit since their context had drifted from unrelated upstream dependency bumps; still required because eclipse-score/persistency#434 is not yet merged. - Remove the redundant local wrapper docs/verification_report/modules/persistency/persistency_verification_report.rst, which duplicated persistency's own post_template need under the same id. docs/verification_report/modules/index.rst now links directly to persistency's own bundled verification report (modules/score_persistency/verification_report/module_verification_report) instead of the local duplicate. - known_good.json and the generated bazel_common/score_modules_target_sw.MODULE.bazel were updated together via scripts/known_good/update_module_from_known_good.py. --- .../score_modules_target_sw.MODULE.bazel | 5 +-- docs/verification_report/modules/index.rst | 4 +- .../persistency_verification_report.rst | 31 ------------- known_good.json | 7 +-- patches/persistency/001-add-mod-need.patch | 37 ---------------- ...rename-manual-verification-report-id.patch | 43 ------------------- .../003-pip-not-dev-dependency.patch | 9 ++-- .../004-imagefs-not-dev-dependency.patch | 12 +++--- .../005-googletest-not-dev-dependency.patch | 10 ++--- .../006-add-module-index-title.patch | 14 ------ 10 files changed, 22 insertions(+), 150 deletions(-) delete mode 100644 docs/verification_report/modules/persistency/persistency_verification_report.rst delete mode 100644 patches/persistency/001-add-mod-need.patch delete mode 100644 patches/persistency/002-rename-manual-verification-report-id.patch delete mode 100644 patches/persistency/006-add-module-index-title.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 96c595bd41f..6a6c0293760 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -44,15 +44,12 @@ git_override( bazel_dep(name = "score_persistency") git_override( module_name = "score_persistency", - commit = "9ae529ba9f413976ff5c9948c6490afa51bbfdc3", + commit = "d2b65ed28aa851f963f623bb5d40a010a48bff77", patch_strip = 1, patches = [ - "//patches/persistency:001-add-mod-need.patch", - "//patches/persistency:002-rename-manual-verification-report-id.patch", "//patches/persistency:003-pip-not-dev-dependency.patch", "//patches/persistency:004-imagefs-not-dev-dependency.patch", "//patches/persistency:005-googletest-not-dev-dependency.patch", - "//patches/persistency:006-add-module-index-title.patch", ], remote = "https://github.com/eclipse-score/persistency.git", ) diff --git a/docs/verification_report/modules/index.rst b/docs/verification_report/modules/index.rst index 72f6777a712..7f4187d4919 100644 --- a/docs/verification_report/modules/index.rst +++ b/docs/verification_report/modules/index.rst @@ -20,11 +20,11 @@ respective module's own needs data using the module verification report template introduced by docs-as-code. * :doc:`Baselibs ` -* :doc:`Persistency ` +* :doc:`Persistency ` .. toctree:: :titlesonly: :hidden: Baselibs - Persistency + Persistency diff --git a/docs/verification_report/modules/persistency/persistency_verification_report.rst b/docs/verification_report/modules/persistency/persistency_verification_report.rst deleted file mode 100644 index 32985424086..00000000000 --- a/docs/verification_report/modules/persistency/persistency_verification_report.rst +++ /dev/null @@ -1,31 +0,0 @@ -.. - # ******************************************************************************* - # Copyright (c) 2026 Contributors to the Eclipse Foundation - # - # See the NOTICE file(s) distributed with this work for additional - # information regarding copyright ownership. - # - # This program and the accompanying materials are made available under the - # terms of the Apache License Version 2.0 which is available at - # https://www.apache.org/licenses/LICENSE-2.0 - # - # SPDX-License-Identifier: Apache-2.0 - # ******************************************************************************* - -Persistency Module Verification Report -======================================= - -.. document:: Persistency Module Verification Report - :id: doc__persistency_verification_report - :post_template: module_verification_report - :status: valid - :safety: QM - :security: NO - :realizes: wp__verification_module_ver_report - :report_version: v1.0 - :version: 1 - -This report is generated from persistency's own needs data. -It uses the module verification report template introduced by docs-as-code. -It complements persistency's own hand-written verification report, -:need:`doc__persistency_manual_verification_report`. diff --git a/known_good.json b/known_good.json index d10ac415a09..048f3f33274 100644 --- a/known_good.json +++ b/known_good.json @@ -67,12 +67,9 @@ "score_persistency": { "repo": "https://github.com/eclipse-score/persistency.git", "bazel_patches": [ - "//patches/persistency:001-add-mod-need.patch", - "//patches/persistency:002-rename-manual-verification-report-id.patch", "//patches/persistency:003-pip-not-dev-dependency.patch", "//patches/persistency:004-imagefs-not-dev-dependency.patch", - "//patches/persistency:005-googletest-not-dev-dependency.patch", - "//patches/persistency:006-add-module-index-title.patch" + "//patches/persistency:005-googletest-not-dev-dependency.patch" ], "metadata": { "code_root_path": "//score/kvs/...", @@ -89,7 +86,7 @@ ], "rust_coverage_config": "ferrocene-coverage-per" }, - "hash": "9ae529ba9f413976ff5c9948c6490afa51bbfdc3" + "hash": "d2b65ed28aa851f963f623bb5d40a010a48bff77" }, "score_kyron": { "repo": "https://github.com/eclipse-score/kyron.git", diff --git a/patches/persistency/001-add-mod-need.patch b/patches/persistency/001-add-mod-need.patch deleted file mode 100644 index f314cdb000a..00000000000 --- a/patches/persistency/001-add-mod-need.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/docs/index.rst b/docs/index.rst ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -95,6 +95,7 @@ - :maxdepth: 1 - - features/persistency/index -+ module/index - module/manuals/index - module/release/release_note - module/safety_mgt/index -diff --git a/docs/module/index.rst b/docs/module/index.rst -new file mode 100644 ---- /dev/null -+++ b/docs/module/index.rst -@@ -0,0 +1,21 @@ -+.. -+ # ******************************************************************************* -+ # Copyright (c) 2026 Contributors to the Eclipse Foundation -+ # -+ # See the NOTICE file(s) distributed with this work for additional -+ # information regarding copyright ownership. -+ # -+ # This program and the accompanying materials are made available under the -+ # terms of the Apache License Version 2.0 which is available at -+ # https://www.apache.org/licenses/LICENSE-2.0 -+ # -+ # SPDX-License-Identifier: Apache-2.0 -+ # ******************************************************************************* -+ -+.. mod:: Persistency -+ :id: mod__persistency -+ :includes: comp__persistency_kvs[version==1] -+ :status: valid -+ :version: 1 -+ :safety: ASIL_B -+ :security: YES diff --git a/patches/persistency/002-rename-manual-verification-report-id.patch b/patches/persistency/002-rename-manual-verification-report-id.patch deleted file mode 100644 index 3d0a83be310..00000000000 --- a/patches/persistency/002-rename-manual-verification-report-id.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/docs/verification_report/module_verification_report.rst b/docs/verification_report/module_verification_report.rst -index 59b80e7..1a3b0e1 100644 ---- a/docs/verification_report/module_verification_report.rst -+++ b/docs/verification_report/module_verification_report.rst -@@ -15,8 +15,11 @@ - Verification Report - =================== - -+.. Renamed from `doc__persistency_verification_report`: that ID is now used -+ by reference_integration's templated (`:post_template:`) module -+ verification report, which aggregates this manual report's data. - .. document:: Persistency Verification Report -- :id: doc__persistency_verification_report -+ :id: doc__persistency_manual_verification_report - :status: valid - :version: 1 - :safety: ASIL_B -diff --git a/docs/module/safety_mgt/module_safety_plan.rst b/docs/module/safety_mgt/module_safety_plan.rst -index 3bab8d9..2568fe1 100644 ---- a/docs/module/safety_mgt/module_safety_plan.rst -+++ b/docs/module/safety_mgt/module_safety_plan.rst -@@ -113,7 +113,7 @@ Module Workproducts List - * - :need:`wp__verification_module_ver_report` - - :need:`gd_temp__mod_ver_report` - - :ndf:`copy('status', need_id='gd_temp__mod_ver_report')` -- - :need:`doc__persistency_verification_report` -+ - :need:`doc__persistency_manual_verification_report` - - * - :need:`wp__module_sw_release_note` - - :need:`gd_temp__rel_mod_rel_note` -diff --git a/docs/module/release/release_note.rst b/docs/module/release/release_note.rst -index cc59ecf..6e3bb25 100644 ---- a/docs/module/release/release_note.rst -+++ b/docs/module/release/release_note.rst -@@ -84,7 +84,7 @@ Performed Verification - ^^^^^^^^^^^^^^^^^^^^^^ - - This release note is based on the verification as documented in module verification report --:need:`doc__persistency_verification_report`. -+:need:`doc__persistency_manual_verification_report`. - - Known Issues - ------------ diff --git a/patches/persistency/003-pip-not-dev-dependency.patch b/patches/persistency/003-pip-not-dev-dependency.patch index c7ecf55594f..805032e7ff2 100644 --- a/patches/persistency/003-pip-not-dev-dependency.patch +++ b/patches/persistency/003-pip-not-dev-dependency.patch @@ -1,7 +1,7 @@ diff --git a/MODULE.bazel b/MODULE.bazel --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -53,10 +53,10 @@ python.toolchain( +@@ -50,13 +50,13 @@ python.toolchain( python_version = PYTHON_VERSION, ) @@ -15,11 +15,13 @@ diff --git a/MODULE.bazel b/MODULE.bazel ) -use_repo(pip, "pip_score_venv_test") +use_repo(pip, "pip_score_persistency_venv_test") + + # C++ toolchain configuration + gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True) diff --git a/score/kvs/tests/test_cases/BUILD b/score/kvs/tests/test_cases/BUILD --- a/score/kvs/tests/test_cases/BUILD +++ b/score/kvs/tests/test_cases/BUILD -@@ -9,7 +9,7 @@ - # https://www.apache.org/licenses/LICENSE-2.0 +@@ -10,7 +10,7 @@ # # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* @@ -27,3 +29,4 @@ diff --git a/score/kvs/tests/test_cases/BUILD b/score/kvs/tests/test_cases/BUILD +load("@pip_score_persistency_venv_test//:requirements.bzl", "all_requirements") load("@rules_python//python:pip.bzl", "compile_pip_requirements") load("@score_tooling//python_basics:defs.bzl", "score_py_pytest", "score_virtualenv") + diff --git a/patches/persistency/004-imagefs-not-dev-dependency.patch b/patches/persistency/004-imagefs-not-dev-dependency.patch index f94de0aec30..313ce99c351 100644 --- a/patches/persistency/004-imagefs-not-dev-dependency.patch +++ b/patches/persistency/004-imagefs-not-dev-dependency.patch @@ -1,12 +1,12 @@ diff --git a/MODULE.bazel b/MODULE.bazel --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -37,7 +37,7 @@ bazel_dep(name = "aspect_rules_lint", version = "2.7.2", dev_dependency = True) - bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.3", dev_dependency = True) +@@ -37,7 +37,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.3", dev_dependency = Tr bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True) - bazel_dep(name = "googletest", version = "1.18.0", dev_dependency = True) - bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.1", dev_dependency = True) --bazel_dep(name = "score_rules_imagefs", version = "0.0.4", dev_dependency = True) -+bazel_dep(name = "score_rules_imagefs", version = "0.0.4") + bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True) + bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.3", dev_dependency = True) +-bazel_dep(name = "score_rules_imagefs", version = "0.1.0", dev_dependency = True) ++bazel_dep(name = "score_rules_imagefs", version = "0.1.0") bazel_dep(name = "score_rust_policies", version = "0.0.5", dev_dependency = True) bazel_dep(name = "score_toolchains_rust", version = "0.10.0", dev_dependency = True) + diff --git a/patches/persistency/005-googletest-not-dev-dependency.patch b/patches/persistency/005-googletest-not-dev-dependency.patch index 0fbebc797bb..0675ff89a91 100644 --- a/patches/persistency/005-googletest-not-dev-dependency.patch +++ b/patches/persistency/005-googletest-not-dev-dependency.patch @@ -1,12 +1,12 @@ diff --git a/MODULE.bazel b/MODULE.bazel --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -38,7 +38,7 @@ bazel_dep(name = "score_tooling", version = "2.2.0") +@@ -35,7 +35,7 @@ bazel_dep(name = "score_tooling", version = "2.2.0") bazel_dep(name = "aspect_rules_lint", version = "2.7.2", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.3", dev_dependency = True) bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True) --bazel_dep(name = "googletest", version = "1.18.0", dev_dependency = True) -+bazel_dep(name = "googletest", version = "1.18.0") - bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.1", dev_dependency = True) - bazel_dep(name = "score_rules_imagefs", version = "0.0.4") +-bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True) ++bazel_dep(name = "googletest", version = "1.17.0.bcr.2") + bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.3", dev_dependency = True) + bazel_dep(name = "score_rules_imagefs", version = "0.1.0") bazel_dep(name = "score_rust_policies", version = "0.0.5", dev_dependency = True) diff --git a/patches/persistency/006-add-module-index-title.patch b/patches/persistency/006-add-module-index-title.patch deleted file mode 100644 index d6b8c096946..00000000000 --- a/patches/persistency/006-add-module-index-title.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/docs/module/index.rst b/docs/module/index.rst -index 0000000..0000000 100644 ---- a/docs/module/index.rst -+++ b/docs/module/index.rst -@@ -10,6 +10,9 @@ - # SPDX-License-Identifier: Apache-2.0 - # ******************************************************************************* - -+Module -+====== -+ - .. mod:: Persistency - :id: mod__persistency - :includes: comp__persistency_kvs[version==1]