From 82d6e759daac6217034dd03a85601286cf2d8411 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:54 +0000 Subject: [PATCH 01/13] ci(atomic-dict): use needs.setup.outputs.matrix for build_wheels Old hardcoded python: [cp312, cp313, cp314, cp314t] x libc: [manylinux, musllinux] never matched docs/packages/atomic-dict.yaml: it built orphan cp312/cp314t combos nothing publishes, while never building the cp310 manylinux wheel 0.5.0 actually needs. The matrix conversion fixes this as a side effect. --- .github/workflows/build-atomic-dict.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-atomic-dict.yml b/.github/workflows/build-atomic-dict.yml index 6f4eedea18e..07cf997bc9e 100644 --- a/.github/workflows/build-atomic-dict.yml +++ b/.github/workflows/build-atomic-dict.yml @@ -50,15 +50,13 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build atomic-dict ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build atomic-dict ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - python: ["cp312", "cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: ATOMIC_DICT_VERSION: ${{ matrix.version }} @@ -74,7 +72,7 @@ jobs: - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} # tests/test_atomic_dict.py is a __main__ script, not pytest tests; run @@ -87,7 +85,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: atomic-dict-${{ env.ATOMIC_DICT_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: atomic-dict-${{ env.ATOMIC_DICT_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: ./wheelhouse/*.whl if-no-files-found: error From 8b7f207fee227a37b195235dbaa40524e017706f Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:54 +0000 Subject: [PATCH 02/13] ci(clickhouse-cityhash): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-clickhouse-cityhash.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-clickhouse-cityhash.yml b/.github/workflows/build-clickhouse-cityhash.yml index 7f6276c81b4..ee2459b7ffb 100644 --- a/.github/workflows/build-clickhouse-cityhash.yml +++ b/.github/workflows/build-clickhouse-cityhash.yml @@ -53,17 +53,17 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build clickhouse-cityhash ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build clickhouse-cityhash ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - # cp314t dropped: upstream's pinned Cython<3.1 generates __pyx_vectorcallfunc - # code that doesn't compile against the free-threaded CPython headers. - python: ["cp312", "cp313", "cp314"] - libc: [manylinux, musllinux] + # cp314t: upstream's pinned Cython<3.1 generates __pyx_vectorcallfunc + # code that doesn't compile against the free-threaded CPython headers; + # docs/packages/clickhouse-cityhash.yaml never declares a 3.14t target, + # so the generated matrix naturally never builds it. + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: CLICKHOUSE_CITYHASH_VERSION: ${{ matrix.version }} @@ -79,7 +79,7 @@ jobs: - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} CIBW_TEST_REQUIRES: pytest @@ -92,7 +92,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: clickhouse-cityhash-${{ env.CLICKHOUSE_CITYHASH_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: clickhouse-cityhash-${{ env.CLICKHOUSE_CITYHASH_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: ./wheelhouse/*.whl if-no-files-found: error From ac27c544f99a29e1432b5362dd6a4cdcec073ba4 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:55 +0000 Subject: [PATCH 03/13] ci(cmarkgfm): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-cmarkgfm.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-cmarkgfm.yml b/.github/workflows/build-cmarkgfm.yml index 2a22a4fa493..84773194fae 100644 --- a/.github/workflows/build-cmarkgfm.yml +++ b/.github/workflows/build-cmarkgfm.yml @@ -51,18 +51,16 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build cmarkgfm ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build cmarkgfm ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} # Per-interpreter (not abi3): build_cmark.py compiles cffi in # out-of-line API mode with no py_limited_api, matching upstream's # cp3x-cp3x wheels (including cp314t). - python: ["cp312", "cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: CMARKGFM_VERSION: ${{ matrix.version }} @@ -94,12 +92,12 @@ jobs: output-dir: wheelhouse/ env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} # Matches upstream's per-platform `[tool.cibuildwheel]` before-all # (yum for manylinux) and its musllinux override (apk). - CIBW_BEFORE_ALL_LINUX: ${{ matrix.libc == 'manylinux' && 'yum install -y libffi-devel' || 'apk add libffi-dev' }} + CIBW_BEFORE_ALL_LINUX: ${{ matrix.platform == 'manylinux' && 'yum install -y libffi-devel' || 'apk add libffi-dev' }} # cffi, both a build-time and a runtime dependency, has a riscv64 # wheel on our registry for manylinux only; musllinux builds it from # sdist against the libffi-dev installed above. @@ -111,7 +109,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: cmarkgfm-${{ env.CMARKGFM_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: cmarkgfm-${{ env.CMARKGFM_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: wheelhouse/*.whl if-no-files-found: error From 46b1147bd7b263c82156201c7cc78b0246def2db Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:55 +0000 Subject: [PATCH 04/13] ci(ckzg): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-ckzg.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ckzg.yml b/.github/workflows/build-ckzg.yml index 78e146f9beb..635dc463aac 100644 --- a/.github/workflows/build-ckzg.yml +++ b/.github/workflows/build-ckzg.yml @@ -49,15 +49,13 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build ckzg ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build ckzg ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - python: ["cp312", "cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: CKZG_VERSION: ${{ matrix.version }} @@ -74,7 +72,7 @@ jobs: - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} CIBW_BEFORE_BUILD_LINUX: | @@ -92,7 +90,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: ckzg-${{ env.CKZG_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: ckzg-${{ env.CKZG_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: ./wheelhouse/*.whl if-no-files-found: error From a73378b28eda1a6120630d31b2d00fdc23288a5f Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:55 +0000 Subject: [PATCH 05/13] ci(aiofastnet): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-aiofastnet.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-aiofastnet.yml b/.github/workflows/build-aiofastnet.yml index f3151eabb7f..ed291e22526 100644 --- a/.github/workflows/build-aiofastnet.yml +++ b/.github/workflows/build-aiofastnet.yml @@ -50,15 +50,13 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build aiofastnet ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build aiofastnet ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - python: ["cp312", "cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: AIOFASTNET_VERSION: ${{ matrix.version }} @@ -77,7 +75,7 @@ jobs: uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 with: output-dir: wheelhouse/ - only: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + only: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 env: CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} @@ -85,7 +83,7 @@ jobs: # No musllinux riscv64 uvloop wheel exists; the suite only adds it as an extra loop when importable. CIBW_TEST_REQUIRES: >- aiohttp async_timeout pytest pytest-aiohttp pytest-asyncio pytest-xdist - ${{ matrix.libc == 'manylinux' && 'uvloop' || '' }} + ${{ matrix.platform == 'manylinux' && 'uvloop' || '' }} # 1.1.1's tests/test_changelog.py imports the top-level tools/ package, # which 1.2.0 dropped; stage it only for 1.1.1 (gotcha: CIBW_TEST_SOURCES # must list every top-level dir the test suite imports from). @@ -100,7 +98,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: aiofastnet-${{ env.AIOFASTNET_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: aiofastnet-${{ env.AIOFASTNET_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: wheelhouse/*.whl if-no-files-found: error From 37b32b0ab8172dc1650e10b42e274ed9bc1cccba Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:55 +0000 Subject: [PATCH 06/13] ci(annotatedyaml): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-annotatedyaml.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-annotatedyaml.yml b/.github/workflows/build-annotatedyaml.yml index 1327eca9145..604a44254d4 100644 --- a/.github/workflows/build-annotatedyaml.yml +++ b/.github/workflows/build-annotatedyaml.yml @@ -49,15 +49,13 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build annotatedyaml ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build annotatedyaml ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - python: ["cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: ANNOTATEDYAML_VERSION: ${{ matrix.version }} @@ -73,7 +71,7 @@ jobs: - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} # Upstream's job-level REQUIRE_CYTHON never reaches the Linux build container. @@ -82,7 +80,7 @@ jobs: PYYAML_FORCE_LIBYAML=1 PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ # musllinux builds PyYAML from sdist; without libyaml it silently lacks CSafeLoader (gotcha 577). - CIBW_BEFORE_TEST: ${{ matrix.libc == 'musllinux' && 'apk add --no-cache yaml-dev' || '' }} + CIBW_BEFORE_TEST: ${{ matrix.platform == 'musllinux' && 'apk add --no-cache yaml-dev' || '' }} CIBW_TEST_SOURCES: tests CIBW_TEST_REQUIRES: 'pytest>=8,<9 pytest-codspeed>=3.2.0 pytest-asyncio>=1.2.0,<2' CIBW_TEST_COMMAND: >- @@ -94,7 +92,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: annotatedyaml-${{ env.ANNOTATEDYAML_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: annotatedyaml-${{ env.ANNOTATEDYAML_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: ./wheelhouse/*.whl if-no-files-found: error From 4090f5ac5c0915c70c67038f78a085861db5af91 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:55 +0000 Subject: [PATCH 07/13] ci(bitstruct): use needs.setup.outputs.matrix for build_wheels Old hardcoded python: [cp312, cp313, cp314, cp314t] never built cp310/cp311, which docs/packages/bitstruct.yaml declares for both pending versions, nor cp315/cp315t, which it also now declares. --- .github/workflows/build-bitstruct.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-bitstruct.yml b/.github/workflows/build-bitstruct.yml index 8b1477b1488..02208c18bfc 100644 --- a/.github/workflows/build-bitstruct.yml +++ b/.github/workflows/build-bitstruct.yml @@ -49,15 +49,13 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build bitstruct ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build bitstruct ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - python: ["cp312", "cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: BITSTRUCT_VERSION: ${{ matrix.version }} @@ -73,7 +71,7 @@ jobs: - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} CIBW_TEST_REQUIRES: pytest @@ -83,7 +81,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: bitstruct-${{ env.BITSTRUCT_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: bitstruct-${{ env.BITSTRUCT_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: ./wheelhouse/*.whl if-no-files-found: error From 971e4c39dbaf430709ee08a2362cf23f37f863f9 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:55 +0000 Subject: [PATCH 08/13] ci(apache-beam): use needs.setup.outputs.matrix for linux job Also starts building cp310/cp311 wheels for every pending version, which the old hardcoded python: [cp312, cp313, cp314] list never attempted despite docs/packages/apache-beam.yaml declaring them (same class of stale-matrix bug as #4914/#4915). --- .github/workflows/build-apache-beam.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-apache-beam.yml b/.github/workflows/build-apache-beam.yml index 84be88a5dbd..58ea45635c4 100644 --- a/.github/workflows/build-apache-beam.yml +++ b/.github/workflows/build-apache-beam.yml @@ -112,18 +112,15 @@ jobs: strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} # cp314t dropped: upstream's own build_wheels.yml matrix never builds - # it (no free-threading support declared for Beam's Cython extensions). - python: ["cp312", "cp313", "cp314"] - exclude: - # 2.61.0 is the newest release still inside apache-flink's declared - # apache-beam<=2.61.0 window; it predates cp313 (and upstream itself - # never shipped a wheel past cp312 for it). - - version: "2.61.0" - python: cp313 - - version: "2.61.0" - python: cp314 + # it (no free-threading support declared for Beam's Cython extensions); + # docs/packages/apache-beam.yaml never declares a 3.14t target, so the + # generated matrix naturally never builds it. Likewise, 2.61.0 being + # the newest release still inside apache-flink's declared + # apache-beam<=2.61.0 window (it predates cp313, and upstream itself + # never shipped a wheel past cp312 for it) is reflected directly in + # that version's own file list, so no per-version exclude is needed. + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: APACHE_BEAM_VERSION: ${{ matrix.version }} From b464058ff4c659138ee4aca5ac1749d739d07005 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:55 +0000 Subject: [PATCH 09/13] ci(convertertools): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-convertertools.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-convertertools.yml b/.github/workflows/build-convertertools.yml index d3470a5b0a6..84f351e0957 100644 --- a/.github/workflows/build-convertertools.yml +++ b/.github/workflows/build-convertertools.yml @@ -49,15 +49,13 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build convertertools ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build convertertools ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 30 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - python: ["cp312", "cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: CONVERTERTOOLS_VERSION: ${{ matrix.version }} @@ -73,7 +71,7 @@ jobs: - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} CIBW_ENVIRONMENT: REQUIRE_CYTHON=1 @@ -86,7 +84,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: convertertools-${{ env.CONVERTERTOOLS_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: convertertools-${{ env.CONVERTERTOOLS_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: ./wheelhouse/*.whl if-no-files-found: error From d8a08ca26e367fc9e27fba0db250166e385adc20 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:56 +0000 Subject: [PATCH 10/13] ci(aiocsv): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-aiocsv.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-aiocsv.yml b/.github/workflows/build-aiocsv.yml index 446a20e1375..ecf47e03bcc 100644 --- a/.github/workflows/build-aiocsv.yml +++ b/.github/workflows/build-aiocsv.yml @@ -49,15 +49,13 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build aiocsv ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build aiocsv ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - python: ["cp312", "cp313", "cp314", "cp314t"] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: AIOCSV_VERSION: ${{ matrix.version }} @@ -74,7 +72,7 @@ jobs: uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 with: output-dir: wheelhouse/ - only: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + only: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 env: CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} @@ -84,7 +82,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: aiocsv-${{ env.AIOCSV_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: aiocsv-${{ env.AIOCSV_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: wheelhouse/*.whl if-no-files-found: error From 9f0e7f5cfb8cee838843fadcfcdda37f637a6443 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:56 +0000 Subject: [PATCH 11/13] ci(componentize-py): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-componentize-py.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-componentize-py.yml b/.github/workflows/build-componentize-py.yml index 37dcde4e218..18745526399 100644 --- a/.github/workflows/build-componentize-py.yml +++ b/.github/workflows/build-componentize-py.yml @@ -55,10 +55,11 @@ jobs: strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} # pyo3 is built with the "abi3-py39" feature (Cargo.toml), matching # upstream's own cp39-abi3 PyPI tag; no free-threaded wheel is published. - python: ["cp39"] + # docs/packages/componentize-py.yaml's single "3.9-abi3:manylinux" + # target already reduces needs.setup.outputs.matrix to exactly cp39. + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: COMPONENTIZE_PY_VERSION: ${{ matrix.version }} From 217567226939c7238dc1e43550c8da30404f7b35 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:56 +0000 Subject: [PATCH 12/13] ci(coincurve): use needs.setup.outputs.matrix for build_wheels --- .github/workflows/build-coincurve.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-coincurve.yml b/.github/workflows/build-coincurve.yml index 692d6c8c35a..d4f55e7ef3a 100644 --- a/.github/workflows/build-coincurve.yml +++ b/.github/workflows/build-coincurve.yml @@ -51,21 +51,20 @@ jobs: build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build coincurve ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build coincurve ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv timeout-minutes: 60 strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} # Per-interpreter (not abi3): hatch_build.py bundles the version-specific # _cffi_backend extension into the wheel. cp314t is dropped: the CMake # build unconditionally compiles with Py_LIMITED_API, which Python itself # rejects under the free-threaded build ("The limited API is not # currently supported in the free-threaded build") on every arch, not - # just riscv64. - python: ["cp312", "cp313", "cp314"] - libc: [manylinux, musllinux] + # just riscv64. docs/packages/coincurve.yaml never declares a 3.14t + # target, so the generated matrix naturally never builds it. + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: COINCURVE_VERSION: ${{ matrix.version }} @@ -97,7 +96,7 @@ jobs: output-dir: wheelhouse/ env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} # cffi, a build-time-only dependency (its _cffi_backend.so gets bundled @@ -116,7 +115,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: coincurve-${{ env.COINCURVE_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: coincurve-${{ env.COINCURVE_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: wheelhouse/*.whl if-no-files-found: error From 492abb76c6ccd574f2aebb54ee830ffb2bf558c7 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 18 Nov 2026 00:10:56 +0000 Subject: [PATCH 13/13] ci(can-ada): use needs.setup.outputs.matrix for build_wheels Adds python-exclude: 'cp39 cp310 cp311' to setup to preserve the file's own deliberate cp312 floor (docs/packages/can-ada.yaml declares cp310/cp311 targets that the generated matrix would otherwise start building). --- .github/workflows/build-can-ada.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-can-ada.yml b/.github/workflows/build-can-ada.yml index 9e0f228b447..02de28b59bd 100644 --- a/.github/workflows/build-can-ada.yml +++ b/.github/workflows/build-can-ada.yml @@ -44,19 +44,21 @@ jobs: with: package: can-ada version: ${{ inputs.version }} + # Upstream builds cp39-cp314, no free-threaded wheel; floor is our own + # cp312. Preserved explicitly here: docs/packages/can-ada.yaml declares + # cp310/cp311 targets too, which the generated matrix would otherwise + # start building. + python-exclude: 'cp39 cp310 cp311' build_wheels: needs: [setup] if: needs.setup.outputs.versions != '[]' - name: Build can-ada ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: Build can-ada ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.platform }}_riscv64 runs-on: ubuntu-24.04-riscv strategy: fail-fast: false matrix: - version: ${{ fromJSON(needs.setup.outputs.versions) }} - # Upstream builds cp39-cp314, no free-threaded wheel; floor is our own cp312. - python: [cp312, cp313, cp314] - libc: [manylinux, musllinux] + include: ${{ fromJSON(needs.setup.outputs.matrix) }} env: CAN_ADA_VERSION: ${{ matrix.version }} @@ -74,7 +76,7 @@ jobs: output-dir: wheelhouse/ env: CIBW_ARCHS: riscv64 - CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.platform }}_riscv64 CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} CIBW_MUSLLINUX_RISCV64_IMAGE: ${{ env.MUSLLINUX_RISCV64_IMAGE }} CIBW_TEST_REQUIRES: pytest @@ -82,7 +84,7 @@ jobs: - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: can-ada-${{ env.CAN_ADA_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + name: can-ada-${{ env.CAN_ADA_VERSION }}-${{ matrix.python }}-${{ matrix.platform }}_riscv64 path: wheelhouse/*.whl if-no-files-found: error