From 716c0edbb4a4813c27a058e635c853c9a11b6b7e Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Sat, 5 Sep 2026 18:06:56 +0200 Subject: [PATCH 1/2] ua-parser-rs: add build-ua-parser-rs.yml for riscv64 wheels --- .github/workflows/build-ua-parser-rs.yml | 116 +++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 .github/workflows/build-ua-parser-rs.yml diff --git a/.github/workflows/build-ua-parser-rs.yml b/.github/workflows/build-ua-parser-rs.yml new file mode 100644 index 0000000000..4897680c69 --- /dev/null +++ b/.github/workflows/build-ua-parser-rs.yml @@ -0,0 +1,116 @@ +# SPDX-FileCopyrightText: 2026 The RISE Project +# SPDX-License-Identifier: MIT +--- +# This workflow is based on the `py-release-wheels`/`py-release-tests` jobs of +# https://github.com/ua-parser/uap-python/blob/ua-parser-rs-0.1.5/.github/workflows/release-wheels.yml +name: Build ua-parser-rs wheels (riscv64) + +on: + workflow_dispatch: + inputs: + version: + description: 'ua-parser-rs version to build (git tag without the ua-parser-rs- prefix, e.g. 0.1.5)' + required: true + default: '0.1.5' + pull_request: + paths: + - '.github/workflows/build-ua-parser-rs.yml' + +concurrency: + group: ${{ github.workflow }}-${{ inputs.version || '0.1.5' }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: + contents: read # to fetch code (actions/checkout) + +env: + # `inputs.version` is empty on pull_request events; default to 0.1.5 there. + UA_PARSER_RS_VERSION: ${{ inputs.version || '0.1.5' }} + MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64 + +jobs: + setup: + uses: $/.github/workflows/_setup.yml + + build_wheels: + needs: [setup] + name: Build ua-parser-rs ${{ inputs.version || '0.1.5' }} ${{ matrix.tag }}-manylinux_riscv64 + runs-on: ubuntu-24.04-riscv + timeout-minutes: 90 + strategy: + fail-fast: false + matrix: + include: + # pyo3's abi3-py310 feature is on unconditionally, so one abi3 wheel + # serves every GIL-ful interpreter; pyo3 disables abi3 under + # Py_GIL_DISABLED, giving the free-threaded build its own wheel + # (same shape as upstream's own cp310-abi3 + cp314t release). + - tag: cp310-abi3 + # Built on cp310 -- the oldest interpreter the abi3 tag claims -- + # and re-tested on the newer ones via find_compatible_wheel. + build: >- + cp310-manylinux_riscv64 cp311-manylinux_riscv64 + cp312-manylinux_riscv64 cp313-manylinux_riscv64 + cp314-manylinux_riscv64 + - tag: cp314t + build: cp314t-manylinux_riscv64 + + steps: + # ua-parser-rs is a pyo3/maturin wheel living at `ua-parser-rs/` inside + # the ua-parser/uap-python monorepo (moved there from ua-parser/uap-rust + # -- the crate's own Cargo.toml still points `homepage`/`repository` at + # the old location). + - name: Checkout uap-python ua-parser-rs-${{ env.UA_PARSER_RS_VERSION }} + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: ua-parser/uap-python + ref: ua-parser-rs-${{ env.UA_PARSER_RS_VERSION }} + submodules: true + persist-credentials: false + + - name: Build wheels + uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 + with: + package-dir: ua-parser-rs + output-dir: wheelhouse/ + env: + # musllinux is dropped: rustup.rs ships no riscv64 musl toolchain. + CIBW_BUILD: ${{ matrix.build }} + CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} + # ua-parser-rs ships no [tool.cibuildwheel], so the Rust toolchain + # its maturin backend needs is installed in-container here. + CIBW_BEFORE_ALL_LINUX: >- + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + CIBW_ENVIRONMENT_LINUX: PATH="$PATH:$HOME/.cargo/bin" + CIBW_TEST_REQUIRES: pytest pyyaml + # CIBW_TEST_SOURCES resolves against the checkout root (the + # uap-python monorepo), not package-dir: staging the top-level + # `ua_parser` package plus the uap-core submodule it tests against + # lets the test command install and exercise the real ua_parser.regex + # backend that wraps this wheel, same as upstream's own CI does. + CIBW_TEST_SOURCES: tests uap-core src pyproject.toml README.rst + CIBW_TEST_COMMAND: >- + python -c " + import ua_parser_rs; + assert ua_parser_rs.__file__.endswith(('.so', '.pyd')), ua_parser_rs.__file__; + e = ua_parser_rs.UserAgentExtractor([('(Chrome)/([0-9]+)', None, None, None, None, None)]); + r = e.extract('Mozilla/5.0 Chrome/120'); + assert r is not None and r.family == 'Chrome' and r.major == '120', r" && + python -m pip install . && + python -m pytest -v tests/test_core.py -k regex + + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: ua_parser_rs-${{ env.UA_PARSER_RS_VERSION }}-${{ matrix.tag }}-manylinux_riscv64 + path: wheelhouse/*.whl + if-no-files-found: error + + publish: + name: Publish ua-parser-rs ${{ inputs.version || '0.1.5' }} + needs: [setup, build_wheels] + permissions: + contents: write + pull-requests: write + uses: $/.github/workflows/_publish-wheel.yml + with: + artifact-pattern: ua_parser_rs-${{ inputs.version || '0.1.5' }}-*-manylinux_riscv64 From 74187e83c32858e5b75e6739e5228c2e52e1f5c5 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Sun, 6 Sep 2026 09:50:52 +0200 Subject: [PATCH 2/2] ua-parser-rs: fix CIBW_TEST_COMMAND (gotchas 56, 247) Two independent bugs in the test command, one per failing matrix leg: - cp310-abi3: the folded >- scalar put python -c's script on the line after the opening quote, so YAML folding inserted a leading space into the -c argument. cp3.9-3.13 raise IndentationError on that (gotcha 247); keep the first statement on the same line as the opening quote. - cp314t: the wheel's ua_parser_rs.__file__ legitimately resolves to maturin's own __init__.py shim (from .ua_parser_rs import *), matching upstream's own published wheel layout exactly (unzip -l confirms both ship ua_parser_rs/__init__.py + ua_parser_rs/ua_parser_rs..so) -- the assertion was probing the wrong name (gotcha 56); probe the ua_parser_rs.ua_parser_rs submodule instead. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01Az13NcXsVZzzxXmaxxUEy7 --- .github/workflows/build-ua-parser-rs.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-ua-parser-rs.yml b/.github/workflows/build-ua-parser-rs.yml index 4897680c69..e6c64d409b 100644 --- a/.github/workflows/build-ua-parser-rs.yml +++ b/.github/workflows/build-ua-parser-rs.yml @@ -89,10 +89,12 @@ jobs: # lets the test command install and exercise the real ua_parser.regex # backend that wraps this wheel, same as upstream's own CI does. CIBW_TEST_SOURCES: tests uap-core src pyproject.toml README.rst + # ua_parser_rs's top-level __init__.py is maturin's own pyi-stub shim + # ('from .ua_parser_rs import *', matching the official PyPI wheel) -- + # the compiled extension is the ua_parser_rs.ua_parser_rs submodule. CIBW_TEST_COMMAND: >- - python -c " - import ua_parser_rs; - assert ua_parser_rs.__file__.endswith(('.so', '.pyd')), ua_parser_rs.__file__; + python -c "import ua_parser_rs; + assert ua_parser_rs.ua_parser_rs.__file__.endswith(('.so', '.pyd')), ua_parser_rs.ua_parser_rs.__file__; e = ua_parser_rs.UserAgentExtractor([('(Chrome)/([0-9]+)', None, None, None, None, None)]); r = e.extract('Mozilla/5.0 Chrome/120'); assert r is not None and r.family == 'Chrome' and r.major == '120', r" &&