From 199aa199e0cd6a87c02b0f671f6a6747317dc94c Mon Sep 17 00:00:00 2001 From: Hubert Gruszecki Date: Mon, 22 Sep 2025 19:22:36 +0200 Subject: [PATCH] fix(python): use github arm64 runner, update deps --- .github/workflows/_build_python_wheels.yml | 16 ++++++++++------ .github/workflows/publish.yml | 4 +++- foreign/python/Cargo.toml | 11 ++++------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/_build_python_wheels.yml b/.github/workflows/_build_python_wheels.yml index 977662e57..e3f6c5a34 100644 --- a/.github/workflows/_build_python_wheels.yml +++ b/.github/workflows/_build_python_wheels.yml @@ -45,10 +45,14 @@ on: jobs: linux: - runs-on: ubuntu-latest + runs-on: ${{ matrix.runner }} strategy: matrix: - target: [x86_64, aarch64] + include: + - target: x86_64 + runner: ubuntu-latest + - target: aarch64 + runner: ubuntu-24.04-arm steps: - name: Download latest copy script from master if: inputs.use_latest_ci @@ -90,8 +94,8 @@ jobs: yum install -y perl-IPC-Cmd fi python3 -m pip --version || python3 -m ensurepip - manylinux: "2_28" - args: --release --out dist --interpreter python3.8 python3.9 python3.10 python3.11 python3.12 python3.13 + manylinux: ${{ matrix.target == 'aarch64' && 'auto' || '2_34' }} + args: --release --out dist --interpreter python3.10 python3.11 python3.12 python3.13 sccache: "true" - name: Upload wheels @@ -135,7 +139,7 @@ jobs: with: target: ${{ matrix.target }} working-directory: foreign/python - args: --release --out dist --interpreter python3.8 python3.9 python3.10 python3.11 python3.12 python3.13 + args: --release --out dist --interpreter python3.10 python3.11 python3.12 python3.13 sccache: "true" - name: Upload wheels @@ -179,7 +183,7 @@ jobs: with: target: x86_64 working-directory: foreign/python - args: --release --out dist --interpreter python3.9 python3.10 python3.11 python3.12 python3.13 + args: --release --out dist --interpreter python3.10 python3.11 python3.12 python3.13 sccache: "true" - name: Upload wheels diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 09ec8032e..1a7a794f7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -107,7 +107,9 @@ jobs: echo "🔍 Verifying commit is on master branch..." git fetch origin master --depth=1000 - if git merge-base --is-ancestor "$COMMIT" origin/master; then + if ${{ inputs.dry_run }}; then + echo "🌵 Dry run, skipping master branch check" + elif git merge-base --is-ancestor "$COMMIT" origin/master; then echo "✅ Commit is on master branch" else echo "❌ ERROR: Commit $COMMIT is not on the master branch!" diff --git a/foreign/python/Cargo.toml b/foreign/python/Cargo.toml index ff13c18d3..46af9c06d 100644 --- a/foreign/python/Cargo.toml +++ b/foreign/python/Cargo.toml @@ -28,16 +28,13 @@ repository = "https://github.com/apache/iggy" [dependencies] bytes = "1.10.1" iggy = { path = "../../core/sdk", version = "0.7.0" } -pyo3 = "0.25.0" -pyo3-async-runtimes = { version = "0.25.0", features = [ +pyo3 = "0.26.0" +pyo3-async-runtimes = { version = "0.26.0", features = [ "attributes", "tokio-runtime", ] } -pyo3-stub-gen = "0.12.0" -tokio = "1.40.0" - -[patch.crates-io] -pyo3-stub-gen = { git = "https://github.com/Jij-Inc/pyo3-stub-gen.git", rev = "1870f637f700605395a666e3bdc0276aece73b5f" } +pyo3-stub-gen = { git = "https://github.com/Jij-Inc/pyo3-stub-gen.git", rev = "63e77533b55782799df28ea4b4676c42d203779e" } +tokio = "1.47.1" [lib] name = "apache_iggy"