Repository navigation
Commit ad24fc8
authored
Bump persistency to latest main (upstream test-venv fix) and refresh overrides (#388)
* Enable persistency integration tests and fix test-venv pip hub collision
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.
* 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.
* 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.
* 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.1 parent 668b038 commit ad24fc8
8 files changed
Lines changed: 54 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | | - | |
| 46 | + | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
50 | | - | |
51 | | - | |
| 49 | + | |
52 | 50 | | |
53 | 51 | | |
54 | 52 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
31 | 38 | | |
32 | 39 | | |
33 | 40 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
65 | | - | |
66 | | - | |
| 64 | + | |
67 | 65 | | |
68 | 66 | | |
69 | 67 | | |
| |||
77 | 75 | | |
78 | 76 | | |
79 | 77 | | |
80 | | - | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
81 | 85 | | |
82 | | - | |
| 86 | + | |
83 | 87 | | |
84 | 88 | | |
85 | 89 | | |
| |||
189 | 193 | | |
190 | 194 | | |
191 | 195 | | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
192 | 201 | | |
193 | 202 | | |
194 | 203 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
This file was deleted.
This file was deleted.
0 commit comments