Repository navigation
Conversation
…ts.matrix aplr, biom-format, boost-histogram, coreforecast, correctionlib and dimod each hardcoded their own python/libc matrix array plus an extra include: block layering a per-leg override (test_skip/test_requires) on top, the same stale-matrix bug class fixed in #4914/#4915 but compounded by that second override axis. Switch build_wheels in each file to matrix: { include: ${{ fromJSON(needs.setup.outputs.matrix) }} }, rename every remaining ${{ matrix.libc }}/hardcoded 'manylinux_riscv64' to ${{ matrix.platform }}, and convert each override into an inline ternary at its point of use (CIBW_TEST_SKIP/CIBW_TEST_REQUIRES), keyed on matrix.python exactly as the old include: block was.
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of the repo-wide migration off hardcoded
matrix.python/matrix.libcarraysonto
needs.setup.outputs.matrix(the bug class fixed in #4914/#4915). This batchcovers the 6 workflows whose
build_wheelsjob layers an extrainclude:block ontop of the hardcoded array to override one field (
test_skip/test_requires) forspecific python legs, which the plain mechanical fix doesn't by itself handle.
Packages touched: aplr, biom-format, boost-histogram, coreforecast, correctionlib, dimod.
What changed, per file
For each file:
strategy.matrixis nowinclude: ${{ fromJSON(needs.setup.outputs.matrix) }}(dropping the hardcoded
version/python/include:keys), every${{ matrix.libc }}/hardcoded
manylinux_riscv64literal (jobname:,only:/CIBW_BUILD, artifactname:)is now
${{ matrix.platform }}, and the extrainclude:override becomes an inlineternary at its point of use, preserving exactly which
matrix.pythonvalue triggers it:test_skip: "*"forcp314t→CIBW_TEST_SKIP: ${{ matrix.python == 'cp314t' && '*' || '' }}.cp314t→test_skip: "*"pattern, same conversion.cp314t→test_skip: "*"pattern, same conversion.cp314t→test_skip: "*"pattern, same conversion. Thecp313/cp314omission (upstream's cp312-abi3 wheel covers them from 0.12.23) no longerneeds a comment on the hardcoded list —
needs.setup.outputs.matrixalready collapsesthose onto the cp312-abi3 leg itself.
cp314t→test_skip: "*"pattern, same conversion.CIBW_BUILDgoes from${{ matrix.python }}-*to${{ matrix.python }}-${{ matrix.platform }}_riscv64.test_requires: "hypothesis==6.165.10"forcp314t→CIBW_TEST_REQUIRES: ${{ matrix.python == 'cp314t' && 'hypothesis==6.165.10' || '' }}.CIBW_BUILDgoes from${{ matrix.python }}-*to${{ matrix.python }}-${{ matrix.platform }}_riscv64.No file needed an added
python-exclude:on thesetup:job (rule 6) — see the realmismatches below, none of which were accompanied by a documented reason for the gap, so
they're left for the structural fix to resolve rather than pinned in place.
Verification (
uv run --quiet ci_scripts/pending_versions.py --python-matrix --python-exclude cp39 <pkg>)Comparing the real output against what each old hardcoded
python: [...]list produced:(
cp312/cp313/cp314/cp314t) never builtcp310/cp311, even thoughdocs/packages/*.yamlalready declares them as pending targets (and, for biom-formatand coreforecast,
cp314tisn't even declared in the YAML at all — that override is nowdead code, kept only for forward compatibility). The structural fix starts building the
previously-missing
cp310/cp311legs; no action taken beyond the migration itself.[cp312, cp314t]list never built thecp311leg thatdocs/packages/dimod.yaml0.12.23 declares (pending,requires-python: '>=3.11'), northe pending
cp315tleg. Both now get picked up structurally.cp310/cp311mismatch as above, plusa second, more serious one: both packages'
docs/packages/*.yamlstill carry pendingmusllinuxfile entries (because numpy ships no musllinux riscv64 wheel, per the existingCIBW_SKIP: '*-musllinux_*'and its comment).needs.setup.outputs.matrixhas no--python-exclude-equivalent for dropping a platform, so it now emits those musllinuxlegs as real matrix entries. With
CIBW_BUILDpinned to that one leg's platform andCIBW_SKIPstill cancelling it out, each musllinux job will have nothing left to build(cibuildwheel errors on an empty build-identifier selection rather than silently
succeeding as before, when the python-only matrix always had a surviving manylinux
build in the same job). This is a real, pre-existing data issue in
docs/packages/boost-histogram.yaml/correctionlib.yaml(out of scope for thisworkflow-only PR — workflow-anatomy.md's documented fix is to strip the pending
musllinux entries from the package YAML, same as
build-scipp.ymlalready does), notsomething introduced by this refactor; flagging it here rather than silently "fixing" it
by touching
docs/packages/*.yaml.No files were skipped.