From 1104f5109ab4632a5e8c4489f374c1520e02ac7a Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Tue, 6 Oct 2026 11:47:16 +0000 Subject: [PATCH 1/4] Enable persistency integration tests and fix test-venv pip hub collision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The score_persistency KVS integration tests (//score/kvs/tests/test_cases:cit, i.e. cit_cpp + cit_rust) could not build in reference_integration: building their test venv failed with × Collision resolution not yet implemented! Saw nodejs_wheel/bin/corepack twice (then iniconfig, pytest, ...) Root cause: the venv is assembled by score_tooling's score_virtualenv, which does py_venv(deps = <@pip_tooling all_requirements> + reqs + ...). persistency passes reqs = all_requirements of its own test hub (@pip_score_persistency_venv_test, renamed by patch 003). That hub re-vendors score_tooling's python_basics/requirements.txt (the test lock lists it as a compile src), so basedpyright, iniconfig, nodejs-wheel-binaries, packaging, pluggy, pygments and pytest exist in BOTH hubs. aspect_rules_py 1.5.2's venv tool cannot merge two different repos that ship the same file (collision resolution is unimplemented regardless of package_collisions=warning/ignore), so venv creation aborts. This surfaced only after persistency was bumped to 323950c (#383) and the module integration-test step was added (#385); it is the first time these tests ran in reference_integration. Fix (patches/persistency/006-dedupe-test-venv-pip-hub.patch): drop the seven packages that score_tooling's @pip_tooling hub already provides from persistency's test lock, so each package is contributed by exactly one hub. pytest and friends come from @pip_tooling (added by score_virtualenv); persistency's hub keeps only its own unique deps (psutil, pytest-env, pytest-html, pytest-metadata, pytest-repeat, testing-utils, jinja2, markupsafe). Verified locally (no docker): both @score_persistency//score/kvs/tests/test_cases:python_tc_venv and @score_persistency//score/kvs/tests/test_cases:cit build successfully with the patch applied. Re-enable the persistency integration_test_targets/integration_test_config in known_good.json (removed in #386) so CI exercises the KVS integration tests. --- .../score_modules_target_sw.MODULE.bazel | 1 + known_good.json | 11 ++- .../006-dedupe-test-venv-pip-hub.patch | 76 +++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 patches/persistency/006-dedupe-test-venv-pip-hub.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index a8d60ed40e0..c1f05aecfcf 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -49,6 +49,7 @@ git_override( "//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-dedupe-test-venv-pip-hub.patch", ], remote = "https://github.com/eclipse-score/persistency.git", ) diff --git a/known_good.json b/known_good.json index a5ba034e044..c6833bcbacf 100644 --- a/known_good.json +++ b/known_good.json @@ -63,7 +63,8 @@ "bazel_patches": [ "//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:005-googletest-not-dev-dependency.patch", + "//patches/persistency:006-dedupe-test-venv-pip-hub.patch" ], "metadata": { "code_root_path": "//score/kvs/...", @@ -77,7 +78,13 @@ "//score/kvs/tests/integration_test_scenarios/...", "//score/kvs/tests/test_cases/..." ], - "rust_coverage_config": "ferrocene-coverage-per" + "rust_coverage_config": "ferrocene-coverage-per", + "integration_test_targets": [ + "//score/kvs/tests/test_cases:cit" + ], + "integration_test_config": [ + "flaky_test_attempts=3" + ] }, "hash": "323950c42431956ce76bf48c407a1709f114876d" }, diff --git a/patches/persistency/006-dedupe-test-venv-pip-hub.patch b/patches/persistency/006-dedupe-test-venv-pip-hub.patch new file mode 100644 index 00000000000..5a10f108ce1 --- /dev/null +++ b/patches/persistency/006-dedupe-test-venv-pip-hub.patch @@ -0,0 +1,76 @@ +diff --git a/score/kvs/tests/test_cases/requirements.txt.lock b/score/kvs/tests/test_cases/requirements.txt.lock +index d8934c4..dfc769d 100644 +--- a/score/kvs/tests/test_cases/requirements.txt.lock ++++ b/score/kvs/tests/test_cases/requirements.txt.lock +@@ -4,16 +4,6 @@ + # + # bazel run //tests/test_cases:requirements.update + # +-basedpyright==1.35.0 \ +- --hash=sha256:2a7e0bd476623d48499e2b18ff6ed19dc28c51909cf9e1152ad355b5809049ad \ +- --hash=sha256:4f4f84023df5a0cd4ee154916ba698596682ac98bacfa22c941ed6aaf07bba4e +- # via -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt +-iniconfig==2.3.0 \ +- --hash=sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730 \ +- --hash=sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12 +- # via +- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt +- # pytest + jinja2==3.1.6 \ + --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \ + --hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67 +@@ -81,31 +71,6 @@ markupsafe==3.0.2 \ + --hash=sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430 \ + --hash=sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50 + # via jinja2 +-nodejs-wheel-binaries==24.11.1 \ +- --hash=sha256:0e14874c3579def458245cdbc3239e37610702b0aa0975c1dc55e2cb80e42102 \ +- --hash=sha256:10197b1c9c04d79403501766f76508b0dac101ab34371ef8a46fcf51773497d0 \ +- --hash=sha256:376b9ea1c4bc1207878975dfeb604f7aa5668c260c6154dcd2af9d42f7734116 \ +- --hash=sha256:413dfffeadfb91edb4d8256545dea797c237bba9b3faefea973cde92d96bb922 \ +- --hash=sha256:5ef598101b0fb1c2bf643abb76dfbf6f76f1686198ed17ae46009049ee83c546 \ +- --hash=sha256:78bc5bb889313b565df8969bb7423849a9c7fc218bf735ff0ce176b56b3e96f0 \ +- --hash=sha256:c2741525c9874b69b3e5a6d6c9179a6fe484ea0c3d5e7b7c01121c8e5d78b7e2 \ +- --hash=sha256:c79a7e43869ccecab1cae8183778249cceb14ca2de67b5650b223385682c6239 \ +- --hash=sha256:cde41d5e4705266688a8d8071debf4f8a6fcea264c61292782672ee75a6905f9 +- # via +- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt +- # basedpyright +-packaging==25.0 \ +- --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \ +- --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f +- # via +- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt +- # pytest +-pluggy==1.6.0 \ +- --hash=sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 \ +- --hash=sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746 +- # via +- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt +- # pytest + psutil==7.1.3 \ + --hash=sha256:0005da714eee687b4b8decd3d6cc7c6db36215c9e74e5ad2264b90c3df7d92dc \ + --hash=sha256:1068c303be3a72f8e18e412c5b2a8f6d31750fb152f9cb106b54090296c9d251 \ +@@ -127,22 +92,6 @@ psutil==7.1.3 \ + --hash=sha256:f39c2c19fe824b47484b96f9692932248a54c43799a84282cfe58d05a6449efd \ + --hash=sha256:fac9cd332c67f4422504297889da5ab7e05fd11e3c4392140f7370f4208ded1f + # via -r tests/test_cases/requirements.txt +-pygments==2.19.2 \ +- --hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \ +- --hash=sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b +- # via +- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt +- # pytest +-pytest==9.0.1 \ +- --hash=sha256:3e9c069ea73583e255c3b21cf46b8d3c56f6e3a1a8f6da94ccb0fcf57b9d73c8 \ +- --hash=sha256:67be0030d194df2dfa7b556f2e56fb3c3315bd5c8822c6951162b92b32ce7dad +- # via +- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt +- # pytest-env +- # pytest-html +- # pytest-metadata +- # pytest-repeat +- # testing-utils + pytest-env==1.1.5 \ + --hash=sha256:91209840aa0e43385073ac464a554ad2947cc2fd663a9debf88d03b01e0cc1cf \ + --hash=sha256:ce90cf8772878515c24b31cd97c7fa1f4481cd68d588419fd45f10ecaee6bc30 From 3f5032e724662d1c9f88d4b67667c82c7b113e70 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Tue, 6 Oct 2026 13:20:34 +0000 Subject: [PATCH 2/4] Bump persistency to latest main and refresh integration-test overrides persistency fixed the test-venv pip hub collision upstream (#463 migrated to score_pytest from score_tools, #466 renamed the hub to pip_score_persistency_venv_test and dropped the unused python_tc_venv IDE venv). Bump the pinned commit to current main (961c0a0) so the reference_integration graph picks up those fixes directly. Consequences of the bump: - Drop 006-dedupe-test-venv-pip-hub.patch: the colliding python_tc_venv it worked around no longer exists upstream. - Regenerate 003/004/005 against the new MODULE.bazel (the old context no longer matched, so Bazel failed to apply them during fetch). - Add 006-tools / 007-sbom: the new main declares score_tools and score_sbom as dev_dependency, but reference_integration (root) needs them non-dev because the test BUILD loads @score_tools//score_pytest and the module root BUILD loads @score_sbom//:defs.bzl. Regenerated bazel_common/score_modules_target_sw.MODULE.bazel and refreshed MODULE.bazel.lock accordingly. --- MODULE.bazel.lock | 8 +- .../score_modules_target_sw.MODULE.bazel | 5 +- known_good.json | 5 +- .../003-pip-not-dev-dependency.patch | 27 +------ .../004-imagefs-not-dev-dependency.patch | 8 +- .../005-googletest-not-dev-dependency.patch | 6 +- .../006-dedupe-test-venv-pip-hub.patch | 76 ------------------- .../006-tools-not-dev-dependency.patch | 13 ++++ .../007-sbom-not-dev-dependency.patch | 13 ++++ 9 files changed, 44 insertions(+), 117 deletions(-) delete mode 100644 patches/persistency/006-dedupe-test-venv-pip-hub.patch create mode 100644 patches/persistency/006-tools-not-dev-dependency.patch create mode 100644 patches/persistency/007-sbom-not-dev-dependency.patch diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 5a01e6ce12f..08c5816d485 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -50,7 +50,6 @@ "https://bcr.bazel.build/modules/aspect_rules_js/2.3.8/source.json": "411ec9d79d6f5fe8a083359588c21d01a5b48d88a2cbd334a4c90365015b7836", "https://bcr.bazel.build/modules/aspect_rules_lint/0.12.0/MODULE.bazel": "e767c5dbfeb254ec03275a7701b5cfde2c4d2873676804bc7cb27ddff3728fed", "https://bcr.bazel.build/modules/aspect_rules_lint/1.0.3/MODULE.bazel": "ed0fe929647ba21d2041e14ea3d757133ca306b72d4998e8a3d0d2f515196765", - "https://bcr.bazel.build/modules/aspect_rules_lint/1.4.2/MODULE.bazel": "78d025facf6fa675fd6f0b62fd6a9a2bec7ef5ae1e288e5b53f4383b98017105", "https://bcr.bazel.build/modules/aspect_rules_lint/2.0.0/MODULE.bazel": "1f4c81edd9af0c54e65dedbe36653fc63dc9a91605313d54d5ab371f853d693c", "https://bcr.bazel.build/modules/aspect_rules_lint/2.3.0/MODULE.bazel": "4d36bce3c1347bb4fed5906877dce0e683cb207f4032711aff32334003bcf835", "https://bcr.bazel.build/modules/aspect_rules_lint/2.5.0/MODULE.bazel": "24f49acb3b8375fa138ba6ab53bcf517ae92529770a04ab04d47c958ff47b63e", @@ -478,7 +477,6 @@ "https://bcr.bazel.build/modules/rules_multitool/0.4.0/MODULE.bazel": "15517987d5c00c9e7faab41fbe22ee67a350b6eabcc1e08baded5c6d9025897f", "https://bcr.bazel.build/modules/rules_multitool/1.11.1/MODULE.bazel": "f826d2d394e8d964e44ebb4a75ebcfe4e9cd4eb150e2ddcd60398ffeb939696a", "https://bcr.bazel.build/modules/rules_multitool/1.11.1/source.json": "201f43de1d35bd17f25a4fed3ba5a2ec500ef5e08b7d4b341bb9fd39cef0cbc6", - "https://bcr.bazel.build/modules/rules_multitool/1.2.0/MODULE.bazel": "8d818d6104f4030930291bbbbc5684702c237dbcdee7229097543e6a6035adaa", "https://bcr.bazel.build/modules/rules_multitool/1.9.0/MODULE.bazel": "8a042b0dbf35e4aaa94c28ad69efa75c9e673e9ea4bd5c0fb70bab75ef9c636b", "https://bcr.bazel.build/modules/rules_nodejs/5.8.2/MODULE.bazel": "6bc03c8f37f69401b888023bf511cb6ee4781433b0cb56236b2e55a21e3a026a", "https://bcr.bazel.build/modules/rules_nodejs/6.2.0/MODULE.bazel": "ec27907f55eb34705adb4e8257952162a2d4c3ed0f0b3b4c3c1aad1fac7be35e", @@ -632,7 +630,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_js/2.3.8/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/0.12.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/1.0.3/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/1.4.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/2.0.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/2.3.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_rules_lint/2.5.0/MODULE.bazel": "not found", @@ -951,7 +948,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_multitool/0.11.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_multitool/0.4.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_multitool/1.11.1/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_multitool/1.2.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_multitool/1.9.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_nodejs/5.8.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_nodejs/6.2.0/MODULE.bazel": "not found", @@ -1017,8 +1013,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_format_checker/0.1.1/source.json": "e3d10be878d1a007967b75a5c6d9c3ec3d47c320685904b7f31c689b3cbcdb3a", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.2/MODULE.bazel": "6d2b227bb6880e9f6871cc8cf94c83399e35c188424f7e9b826262de8149ed43", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.2/source.json": "5ae55f0dabcddeb5bfae16ce480e2c065f907d2b0ed6a8e4ed7409b259b004ee", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/MODULE.bazel": "53bd16dfbb1fb8ecf6822fb26f9f4e8333bac7b14d12bb02bf84078063820a31", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/source.json": "28ed0207a16f8498a84fae4983fa73060805003a4fbd68c6d749e2f1cc14601f", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_qnx_unit_tests/0.2.0/MODULE.bazel": "aaffff67916dd058737aac8e04368f12b214e7646ff58adbab48e6429d1a5410", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_qnx_unit_tests/0.2.0/source.json": "c40a614fd88beab7cb65b8640debd44eff3fbc32a7839734ef1112f265d2eeef", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rules_imagefs/0.0.1/MODULE.bazel": "1778b64b50002e31f8531bc4cc63c454eb830e769af5034825361c5d408edf68", @@ -1030,6 +1024,8 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_sbom/0.1.1/source.json": "aba932cfdf7a6cc2882fe8cf8cdb2f92ff9b3bbbd8933ba1677c28e548618170", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.8.0/MODULE.bazel": "ea57a9a4dcb8ad49f4556f824500eb559365f413ccbb39d70d0b363685aacec5", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.8.0/source.json": "394a615e03ad722bc27bd4a6f098c6ff2fe7120b69cdf3925d47e39d30ada8a4", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_tools/0.0.3/MODULE.bazel": "69f441bf28d938de2b6aef61ec91e65633f8ea908d2527e6f5a424895c9ac388", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_tools/0.0.3/source.json": "84fda1c7e1e73811b67c239ce4d10800132c87dbc0af549ab425e66e679dc37f", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.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/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index c1f05aecfcf..33be5b5fb55 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -43,13 +43,14 @@ git_override( bazel_dep(name = "score_persistency") git_override( module_name = "score_persistency", - commit = "323950c42431956ce76bf48c407a1709f114876d", + commit = "961c0a0989755a1e0fe8de55e83c0a44e2e20b56", patch_strip = 1, patches = [ "//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-dedupe-test-venv-pip-hub.patch", + "//patches/persistency:006-tools-not-dev-dependency.patch", + "//patches/persistency:007-sbom-not-dev-dependency.patch", ], remote = "https://github.com/eclipse-score/persistency.git", ) diff --git a/known_good.json b/known_good.json index c6833bcbacf..1c20a4ba25a 100644 --- a/known_good.json +++ b/known_good.json @@ -64,7 +64,8 @@ "//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-dedupe-test-venv-pip-hub.patch" + "//patches/persistency:006-tools-not-dev-dependency.patch", + "//patches/persistency:007-sbom-not-dev-dependency.patch" ], "metadata": { "code_root_path": "//score/kvs/...", @@ -86,7 +87,7 @@ "flaky_test_attempts=3" ] }, - "hash": "323950c42431956ce76bf48c407a1709f114876d" + "hash": "961c0a0989755a1e0fe8de55e83c0a44e2e20b56" }, "score_kyron": { "repo": "https://github.com/eclipse-score/kyron.git", diff --git a/patches/persistency/003-pip-not-dev-dependency.patch b/patches/persistency/003-pip-not-dev-dependency.patch index a58395dbf48..8ab1d910bdb 100644 --- a/patches/persistency/003-pip-not-dev-dependency.patch +++ b/patches/persistency/003-pip-not-dev-dependency.patch @@ -1,34 +1,13 @@ diff --git a/MODULE.bazel b/MODULE.bazel -index 39631dba..d8a496a3 100644 +index 2649521..7a652c1 100644 --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -54,13 +54,13 @@ python.toolchain( +@@ -62,7 +62,7 @@ python.toolchain( python_version = PYTHON_VERSION, ) -pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_dependency = True) +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") pip.parse( -- hub_name = "pip_score_venv_test", -+ hub_name = "pip_score_persistency_venv_test", + hub_name = "pip_score_persistency_venv_test", python_version = PYTHON_VERSION, - requirements_lock = "//score/kvs/tests/test_cases:requirements.txt.lock", - ) --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 -index fb3eab4d..5b4a2c9d 100644 ---- a/score/kvs/tests/test_cases/BUILD -+++ b/score/kvs/tests/test_cases/BUILD -@@ -10,7 +10,7 @@ - # - # SPDX-License-Identifier: Apache-2.0 - # ******************************************************************************* --load("@pip_score_venv_test//:requirements.bzl", "all_requirements") -+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 0b54eeedc70..dbc9ebd99cf 100644 --- a/patches/persistency/004-imagefs-not-dev-dependency.patch +++ b/patches/persistency/004-imagefs-not-dev-dependency.patch @@ -1,13 +1,13 @@ diff --git a/MODULE.bazel b/MODULE.bazel -index d8a496a3..5ea1aea6 100644 +index 7a652c1..0fe4d1e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -41,7 +41,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) +@@ -41,7 +41,7 @@ bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True) 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_sbom", version = "0.1.1", 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) - + bazel_dep(name = "score_tools", version = "0.0.3", dev_dependency = True) diff --git a/patches/persistency/005-googletest-not-dev-dependency.patch b/patches/persistency/005-googletest-not-dev-dependency.patch index 16677db3f6f..e6c05578021 100644 --- a/patches/persistency/005-googletest-not-dev-dependency.patch +++ b/patches/persistency/005-googletest-not-dev-dependency.patch @@ -1,13 +1,13 @@ diff --git a/MODULE.bazel b/MODULE.bazel -index 5ea1aea6..d9c3df03 100644 +index 0fe4d1e..1aae83e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -39,7 +39,7 @@ bazel_dep(name = "score_coverage", version = "0.3.1", dev_dependency = True) +@@ -38,7 +38,7 @@ bazel_dep(name = "score_coverage", version = "0.3.1", dev_dependency = True) 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.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_sbom", version = "0.1.1", 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-dedupe-test-venv-pip-hub.patch b/patches/persistency/006-dedupe-test-venv-pip-hub.patch deleted file mode 100644 index 5a10f108ce1..00000000000 --- a/patches/persistency/006-dedupe-test-venv-pip-hub.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/score/kvs/tests/test_cases/requirements.txt.lock b/score/kvs/tests/test_cases/requirements.txt.lock -index d8934c4..dfc769d 100644 ---- a/score/kvs/tests/test_cases/requirements.txt.lock -+++ b/score/kvs/tests/test_cases/requirements.txt.lock -@@ -4,16 +4,6 @@ - # - # bazel run //tests/test_cases:requirements.update - # --basedpyright==1.35.0 \ -- --hash=sha256:2a7e0bd476623d48499e2b18ff6ed19dc28c51909cf9e1152ad355b5809049ad \ -- --hash=sha256:4f4f84023df5a0cd4ee154916ba698596682ac98bacfa22c941ed6aaf07bba4e -- # via -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt --iniconfig==2.3.0 \ -- --hash=sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730 \ -- --hash=sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12 -- # via -- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt -- # pytest - jinja2==3.1.6 \ - --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \ - --hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67 -@@ -81,31 +71,6 @@ markupsafe==3.0.2 \ - --hash=sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430 \ - --hash=sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50 - # via jinja2 --nodejs-wheel-binaries==24.11.1 \ -- --hash=sha256:0e14874c3579def458245cdbc3239e37610702b0aa0975c1dc55e2cb80e42102 \ -- --hash=sha256:10197b1c9c04d79403501766f76508b0dac101ab34371ef8a46fcf51773497d0 \ -- --hash=sha256:376b9ea1c4bc1207878975dfeb604f7aa5668c260c6154dcd2af9d42f7734116 \ -- --hash=sha256:413dfffeadfb91edb4d8256545dea797c237bba9b3faefea973cde92d96bb922 \ -- --hash=sha256:5ef598101b0fb1c2bf643abb76dfbf6f76f1686198ed17ae46009049ee83c546 \ -- --hash=sha256:78bc5bb889313b565df8969bb7423849a9c7fc218bf735ff0ce176b56b3e96f0 \ -- --hash=sha256:c2741525c9874b69b3e5a6d6c9179a6fe484ea0c3d5e7b7c01121c8e5d78b7e2 \ -- --hash=sha256:c79a7e43869ccecab1cae8183778249cceb14ca2de67b5650b223385682c6239 \ -- --hash=sha256:cde41d5e4705266688a8d8071debf4f8a6fcea264c61292782672ee75a6905f9 -- # via -- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt -- # basedpyright --packaging==25.0 \ -- --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \ -- --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f -- # via -- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt -- # pytest --pluggy==1.6.0 \ -- --hash=sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3 \ -- --hash=sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746 -- # via -- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt -- # pytest - psutil==7.1.3 \ - --hash=sha256:0005da714eee687b4b8decd3d6cc7c6db36215c9e74e5ad2264b90c3df7d92dc \ - --hash=sha256:1068c303be3a72f8e18e412c5b2a8f6d31750fb152f9cb106b54090296c9d251 \ -@@ -127,22 +92,6 @@ psutil==7.1.3 \ - --hash=sha256:f39c2c19fe824b47484b96f9692932248a54c43799a84282cfe58d05a6449efd \ - --hash=sha256:fac9cd332c67f4422504297889da5ab7e05fd11e3c4392140f7370f4208ded1f - # via -r tests/test_cases/requirements.txt --pygments==2.19.2 \ -- --hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \ -- --hash=sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b -- # via -- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt -- # pytest --pytest==9.0.1 \ -- --hash=sha256:3e9c069ea73583e255c3b21cf46b8d3c56f6e3a1a8f6da94ccb0fcf57b9d73c8 \ -- --hash=sha256:67be0030d194df2dfa7b556f2e56fb3c3315bd5c8822c6951162b92b32ce7dad -- # via -- # -r /home/arkjedrz/.cache/bazel/_bazel_arkjedrz/adbb5e0ca4374ec9e368894d6ca49e09/external/score_tooling+/python_basics/requirements.txt -- # pytest-env -- # pytest-html -- # pytest-metadata -- # pytest-repeat -- # testing-utils - pytest-env==1.1.5 \ - --hash=sha256:91209840aa0e43385073ac464a554ad2947cc2fd663a9debf88d03b01e0cc1cf \ - --hash=sha256:ce90cf8772878515c24b31cd97c7fa1f4481cd68d588419fd45f10ecaee6bc30 diff --git a/patches/persistency/006-tools-not-dev-dependency.patch b/patches/persistency/006-tools-not-dev-dependency.patch new file mode 100644 index 00000000000..d5eae9de72c --- /dev/null +++ b/patches/persistency/006-tools-not-dev-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index 1aae83e..9b65df4 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -44,7 +44,7 @@ bazel_dep(name = "score_sbom", version = "0.1.1", 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) +-bazel_dep(name = "score_tools", version = "0.0.3", dev_dependency = True) ++bazel_dep(name = "score_tools", version = "0.0.3") + + # Pinned past v0.0.3 for the `$(locations)` fix in score_pytest. + git_override( diff --git a/patches/persistency/007-sbom-not-dev-dependency.patch b/patches/persistency/007-sbom-not-dev-dependency.patch new file mode 100644 index 00000000000..e49c0466f3f --- /dev/null +++ b/patches/persistency/007-sbom-not-dev-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index 9b65df4..6c17327 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -40,7 +40,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.17.0.bcr.2") + bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.3", dev_dependency = True) +-bazel_dep(name = "score_sbom", version = "0.1.1", dev_dependency = True) ++bazel_dep(name = "score_sbom", version = "0.1.1") + 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) From c689a22ea21889a2d20f595e729e94613952c330 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Tue, 6 Oct 2026 13:57:21 +0000 Subject: [PATCH 3/4] Pin score_tools to the $(locations) fix for persistency cit tests Persistency's integration test //score/kvs/tests/test_cases:cit failed in analysis: cit_cpp: label '...:cit_files' in $(location) expression expands to more than one file, please use $(locations ...) instead. score_pytest (from score_tools) only emits the correct $(locations ...) for multi-file srcs starting at a commit past the registry version 0.0.3. Persistency's own MODULE.bazel git_overrides score_tools to 4b48cec for exactly this fix, but Bzlmod ignores non-root overrides, so RI (root) was resolving score_tools 0.0.3 from the registry (still buggy). Add score_tools to known_good.json pinned to the same commit so the root module applies the override, regenerate the tooling MODULE fragment and refresh the lockfile. --- MODULE.bazel.lock | 2 -- bazel_common/score_modules_tooling.MODULE.bazel | 7 +++++++ known_good.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 08c5816d485..e36068a0f61 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1024,8 +1024,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_sbom/0.1.1/source.json": "aba932cfdf7a6cc2882fe8cf8cdb2f92ff9b3bbbd8933ba1677c28e548618170", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.8.0/MODULE.bazel": "ea57a9a4dcb8ad49f4556f824500eb559365f413ccbb39d70d0b363685aacec5", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.8.0/source.json": "394a615e03ad722bc27bd4a6f098c6ff2fe7120b69cdf3925d47e39d30ada8a4", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_tools/0.0.3/MODULE.bazel": "69f441bf28d938de2b6aef61ec91e65633f8ea908d2527e6f5a424895c9ac388", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_tools/0.0.3/source.json": "84fda1c7e1e73811b67c239ce4d10800132c87dbc0af549ab425e66e679dc37f", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.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/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel index 0a73b4bf1e4..74ea0e0735c 100644 --- a/bazel_common/score_modules_tooling.MODULE.bazel +++ b/bazel_common/score_modules_tooling.MODULE.bazel @@ -28,6 +28,13 @@ git_override( remote = "https://github.com/eclipse-score/itf.git", ) +bazel_dep(name = "score_tools") +git_override( + module_name = "score_tools", + commit = "4b48cec400c67be75cfc3fa4658ac6a0489bf7a8", + remote = "https://github.com/eclipse-score/tools.git", +) + bazel_dep(name = "score_tooling") git_override( module_name = "score_tooling", diff --git a/known_good.json b/known_good.json index 1c20a4ba25a..04967302a80 100644 --- a/known_good.json +++ b/known_good.json @@ -197,6 +197,11 @@ "repo": "https://github.com/eclipse-score/itf.git", "hash": "802e0186d373e0d9d67c1c9ccb1ea08952c7ad06" }, + "score_tools": { + "repo": "https://github.com/eclipse-score/tools.git", + "docs": false, + "hash": "4b48cec400c67be75cfc3fa4658ac6a0489bf7a8" + }, "score_tooling": { "repo": "https://github.com/eclipse-score/tooling.git", "docs": false, From dd384232da0f520213ee40c23fb795f3fbeda52a Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Tue, 6 Oct 2026 14:24:57 +0000 Subject: [PATCH 4/4] Consolidate persistency dev_dependency flips into one patch The five patches 003-007 all edited the same file (MODULE.bazel) and four of them touched the same hunk region, so none of 005/006/007 applied standalone - they only worked as a sequential chain in exactly the known_good.json order, each carrying the previous ones' edits as context. Reordering or dropping any entry silently broke the rest. Replace them with a single patch containing two clean hunks. Same net effect: flip googletest, score_sbom, score_rules_imagefs, score_tools and the pip extension to non-dev, because their apparent names appear in BUILD/.bzl files that reference_integration evaluates (//:BUILD for the docs bundle, test_cases/BUILD for the pip hub). Extensions RI never evaluates, such as sbom_metadata and imagefs, stay dev on purpose. Verified: the patch applies standalone, and both @score_persistency//score/kvs/tests/test_cases:cit and @score_persistency//:docs_bundle resolve with --lockfile_mode=error. --- .../score_modules_target_sw.MODULE.bazel | 6 +--- known_good.json | 6 +--- .../003-pip-not-dev-dependency.patch | 13 -------- .../003-undev-deps-for-root-module.patch | 31 +++++++++++++++++++ .../004-imagefs-not-dev-dependency.patch | 13 -------- .../005-googletest-not-dev-dependency.patch | 13 -------- .../006-tools-not-dev-dependency.patch | 13 -------- .../007-sbom-not-dev-dependency.patch | 13 -------- 8 files changed, 33 insertions(+), 75 deletions(-) delete mode 100644 patches/persistency/003-pip-not-dev-dependency.patch create mode 100644 patches/persistency/003-undev-deps-for-root-module.patch delete mode 100644 patches/persistency/004-imagefs-not-dev-dependency.patch delete mode 100644 patches/persistency/005-googletest-not-dev-dependency.patch delete mode 100644 patches/persistency/006-tools-not-dev-dependency.patch delete mode 100644 patches/persistency/007-sbom-not-dev-dependency.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 33be5b5fb55..8327f1632f5 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -46,11 +46,7 @@ git_override( commit = "961c0a0989755a1e0fe8de55e83c0a44e2e20b56", patch_strip = 1, patches = [ - "//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-tools-not-dev-dependency.patch", - "//patches/persistency:007-sbom-not-dev-dependency.patch", + "//patches/persistency:003-undev-deps-for-root-module.patch", ], remote = "https://github.com/eclipse-score/persistency.git", ) diff --git a/known_good.json b/known_good.json index 04967302a80..fdf6d39c705 100644 --- a/known_good.json +++ b/known_good.json @@ -61,11 +61,7 @@ "score_persistency": { "repo": "https://github.com/eclipse-score/persistency.git", "bazel_patches": [ - "//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-tools-not-dev-dependency.patch", - "//patches/persistency:007-sbom-not-dev-dependency.patch" + "//patches/persistency:003-undev-deps-for-root-module.patch" ], "metadata": { "code_root_path": "//score/kvs/...", diff --git a/patches/persistency/003-pip-not-dev-dependency.patch b/patches/persistency/003-pip-not-dev-dependency.patch deleted file mode 100644 index 8ab1d910bdb..00000000000 --- a/patches/persistency/003-pip-not-dev-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 2649521..7a652c1 100644 ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -62,7 +62,7 @@ python.toolchain( - python_version = PYTHON_VERSION, - ) - --pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_dependency = True) -+pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") - pip.parse( - hub_name = "pip_score_persistency_venv_test", - python_version = PYTHON_VERSION, diff --git a/patches/persistency/003-undev-deps-for-root-module.patch b/patches/persistency/003-undev-deps-for-root-module.patch new file mode 100644 index 00000000000..d2d798e4e91 --- /dev/null +++ b/patches/persistency/003-undev-deps-for-root-module.patch @@ -0,0 +1,31 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index 2649521..6c17327 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -38,13 +38,13 @@ bazel_dep(name = "score_coverage", version = "0.3.1", dev_dependency = True) + 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.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_sbom", version = "0.1.1", dev_dependency = True) +-bazel_dep(name = "score_rules_imagefs", version = "0.1.0", dev_dependency = True) ++bazel_dep(name = "score_sbom", version = "0.1.1") ++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) +-bazel_dep(name = "score_tools", version = "0.0.3", dev_dependency = True) ++bazel_dep(name = "score_tools", version = "0.0.3") + + # Pinned past v0.0.3 for the `$(locations)` fix in score_pytest. + git_override( +@@ -62,7 +62,7 @@ python.toolchain( + python_version = PYTHON_VERSION, + ) + +-pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_dependency = True) ++pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") + pip.parse( + hub_name = "pip_score_persistency_venv_test", + python_version = PYTHON_VERSION, diff --git a/patches/persistency/004-imagefs-not-dev-dependency.patch b/patches/persistency/004-imagefs-not-dev-dependency.patch deleted file mode 100644 index dbc9ebd99cf..00000000000 --- a/patches/persistency/004-imagefs-not-dev-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 7a652c1..0fe4d1e 100644 ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -41,7 +41,7 @@ bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True) - 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_sbom", version = "0.1.1", 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) - bazel_dep(name = "score_tools", version = "0.0.3", dev_dependency = True) diff --git a/patches/persistency/005-googletest-not-dev-dependency.patch b/patches/persistency/005-googletest-not-dev-dependency.patch deleted file mode 100644 index e6c05578021..00000000000 --- a/patches/persistency/005-googletest-not-dev-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 0fe4d1e..1aae83e 100644 ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -38,7 +38,7 @@ bazel_dep(name = "score_coverage", version = "0.3.1", dev_dependency = True) - 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.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_sbom", version = "0.1.1", dev_dependency = True) - bazel_dep(name = "score_rules_imagefs", version = "0.1.0") diff --git a/patches/persistency/006-tools-not-dev-dependency.patch b/patches/persistency/006-tools-not-dev-dependency.patch deleted file mode 100644 index d5eae9de72c..00000000000 --- a/patches/persistency/006-tools-not-dev-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 1aae83e..9b65df4 100644 ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -44,7 +44,7 @@ bazel_dep(name = "score_sbom", version = "0.1.1", 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) --bazel_dep(name = "score_tools", version = "0.0.3", dev_dependency = True) -+bazel_dep(name = "score_tools", version = "0.0.3") - - # Pinned past v0.0.3 for the `$(locations)` fix in score_pytest. - git_override( diff --git a/patches/persistency/007-sbom-not-dev-dependency.patch b/patches/persistency/007-sbom-not-dev-dependency.patch deleted file mode 100644 index e49c0466f3f..00000000000 --- a/patches/persistency/007-sbom-not-dev-dependency.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MODULE.bazel b/MODULE.bazel -index 9b65df4..6c17327 100644 ---- a/MODULE.bazel -+++ b/MODULE.bazel -@@ -40,7 +40,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.17.0.bcr.2") - bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.3", dev_dependency = True) --bazel_dep(name = "score_sbom", version = "0.1.1", dev_dependency = True) -+bazel_dep(name = "score_sbom", version = "0.1.1") - 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)