From 457542539946778d6acd88345d0dd97240a8b084 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 25 Sep 2026 10:43:12 +0000 Subject: [PATCH 1/3] annotatedyaml: Add version 1.0.2 --- .github/workflows/build-annotatedyaml.yml | 108 ++++++++++++++++++++++ docs/packages/annotatedyaml.yaml | 5 + 2 files changed, 113 insertions(+) create mode 100644 .github/workflows/build-annotatedyaml.yml create mode 100644 docs/packages/annotatedyaml.yaml diff --git a/.github/workflows/build-annotatedyaml.yml b/.github/workflows/build-annotatedyaml.yml new file mode 100644 index 00000000000..e9d9768a667 --- /dev/null +++ b/.github/workflows/build-annotatedyaml.yml @@ -0,0 +1,108 @@ +# SPDX-FileCopyrightText: 2026 The RISE Project +# SPDX-License-Identifier: MIT +--- +# Based on the `build_wheels` and `test` jobs of +# https://github.com/home-assistant-libs/annotatedyaml/blob/v1.0.2/.github/workflows/ci.yml +name: Build annotatedyaml wheels (riscv64) + +on: + workflow_dispatch: + inputs: + version: + description: 'Version glob to (re)build; empty builds every version of docs/packages/annotatedyaml.yaml not released yet' + required: false + default: '' + pull_request: + branches: [main] + paths: + - '.github/workflows/build-annotatedyaml.yml' + - 'docs/packages/annotatedyaml.yaml' + push: + branches: [main] + paths: + - '.github/workflows/build-annotatedyaml.yml' + - 'docs/packages/annotatedyaml.yaml' + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: + contents: read # to fetch code (actions/checkout) + +env: + MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64 + MUSLLINUX_RISCV64_IMAGE: quay.io/pypa/musllinux_1_2_riscv64 + +jobs: + setup: + uses: $/.github/workflows/_setup.yml + with: + package: annotatedyaml + version: ${{ inputs.version }} + + build_wheels: + needs: [setup] + if: needs.setup.outputs.versions != '[]' + name: Build annotatedyaml ${{ matrix.version }} ${{ matrix.python }}-${{ matrix.libc }}_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] + + env: + ANNOTATEDYAML_VERSION: ${{ matrix.version }} + + steps: + - name: Checkout annotatedyaml v${{ env.ANNOTATEDYAML_VERSION }} + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: home-assistant-libs/annotatedyaml + ref: v${{ env.ANNOTATEDYAML_VERSION }} + persist-credentials: false + + - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 + env: + CIBW_ARCHS: riscv64 + CIBW_BUILD: ${{ matrix.python }}-${{ matrix.libc }}_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. + CIBW_ENVIRONMENT: >- + REQUIRE_CYTHON=1 + PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ + CIBW_TEST_SOURCES: tests + CIBW_TEST_REQUIRES: 'pytest>=8,<9 pytest-codspeed>=3.2.0 pytest-asyncio>=1.2.0,<2' + CIBW_TEST_COMMAND: >- + python -c "from annotatedyaml import constructors, reference; + m = [constructors, reference]; + bad = [x.__name__ for x in m if not x.__file__.endswith('.so')]; + assert not bad, bad" && + python -m pytest tests + + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: annotatedyaml-${{ env.ANNOTATEDYAML_VERSION }}-${{ matrix.python }}-${{ matrix.libc }}_riscv64 + path: ./wheelhouse/*.whl + if-no-files-found: error + + publish: + name: Publish annotatedyaml ${{ matrix.version }} + needs: [setup, build_wheels] + if: needs.setup.outputs.versions != '[]' + strategy: + fail-fast: false + matrix: + version: ${{ fromJSON(needs.setup.outputs.versions) }} + permissions: + contents: write + pull-requests: write + uses: $/.github/workflows/_publish-wheel.yml + secrets: + app-private-key: ${{ secrets.RISEPROJECT_APP_PRIVATE_KEY }} + with: + artifact-pattern: annotatedyaml-${{ matrix.version }}-*riscv64 diff --git a/docs/packages/annotatedyaml.yaml b/docs/packages/annotatedyaml.yaml new file mode 100644 index 00000000000..3a515ec5301 --- /dev/null +++ b/docs/packages/annotatedyaml.yaml @@ -0,0 +1,5 @@ +package-name: annotatedyaml +source-code: https://github.com/home-assistant-libs/annotatedyaml +license: Apache-2.0 +versions: +- version: 1.0.2 From 0331e44376f7a6084761c312b600bc90fe1e8b09 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 25 Sep 2026 18:40:31 +0000 Subject: [PATCH 2/3] annotatedyaml: Build PyYAML against libyaml for musllinux tests No musllinux riscv64 PyYAML wheel exists, so the test install builds it from sdist; the musllinux image has no libyaml headers, so PyYAML silently falls back to pure Python and the tests' try_both_loaders / try_both_dumpers fixtures fail on the missing CSafeLoader/CSafeDumper. Install yaml-dev before testing on musllinux and set PYYAML_FORCE_LIBYAML=1 so a missing libyaml fails the build instead. --- .github/workflows/build-annotatedyaml.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-annotatedyaml.yml b/.github/workflows/build-annotatedyaml.yml index e9d9768a667..0865d7ef123 100644 --- a/.github/workflows/build-annotatedyaml.yml +++ b/.github/workflows/build-annotatedyaml.yml @@ -74,7 +74,10 @@ jobs: # Upstream's job-level REQUIRE_CYTHON never reaches the Linux build container. CIBW_ENVIRONMENT: >- REQUIRE_CYTHON=1 + PYYAML_FORCE_LIBYAML=1 PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ + # No musllinux riscv64 PyYAML wheel exists; without libyaml its sdist silently builds pure-Python (no CSafeLoader). + CIBW_BEFORE_TEST: ${{ matrix.libc == '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: >- From dfa24bc11f3adb0e64e7d517d5cfe7c732dce171 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 25 Sep 2026 18:41:35 +0000 Subject: [PATCH 3/3] annotatedyaml: Cite gotcha 577 for the musllinux libyaml step --- .github/workflows/build-annotatedyaml.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-annotatedyaml.yml b/.github/workflows/build-annotatedyaml.yml index 0865d7ef123..ef7c4166db7 100644 --- a/.github/workflows/build-annotatedyaml.yml +++ b/.github/workflows/build-annotatedyaml.yml @@ -76,7 +76,7 @@ jobs: REQUIRE_CYTHON=1 PYYAML_FORCE_LIBYAML=1 PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ - # No musllinux riscv64 PyYAML wheel exists; without libyaml its sdist silently builds pure-Python (no CSafeLoader). + # 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_TEST_SOURCES: tests CIBW_TEST_REQUIRES: 'pytest>=8,<9 pytest-codspeed>=3.2.0 pytest-asyncio>=1.2.0,<2'