From 849a29ef5bb41135f830d28ed589957abb575196 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 16 Jun 2025 11:52:28 -0600 Subject: [PATCH 1/7] fix: wheels --- .github/workflows/ci.yaml | 2 +- .github/workflows/docs.yaml | 2 +- Cargo.lock | 5 ----- Cargo.toml | 3 --- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 558946d..ac536e7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,7 +11,7 @@ concurrency: cancel-in-progress: true env: - duckdb-version: "1.2.2" + duckdb-version: "1.3.0" jobs: test: diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 388e182..a358e65 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - duckdb-version: "1.2.2" + duckdb-version: "1.3.0" jobs: deploy: diff --git a/Cargo.lock b/Cargo.lock index 5a75e67..7f137d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5369,8 +5369,3 @@ dependencies = [ "cc", "pkg-config", ] - -[[patch.unused]] -name = "duckdb" -version = "1.2.2" -source = "git+https://github.com/gadomski/duckdb-rs/?branch=arrow-v55#2103b2a2107db247482bcf54fffcba790f682134" diff --git a/Cargo.toml b/Cargo.toml index e7955d7..1ba9608 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,6 +49,3 @@ futures-util = "0.3.31" [build-dependencies] cargo-lock = "10" - -[patch.crates-io] -duckdb = { git = "https://github.com/gadomski/duckdb-rs/", branch = "arrow-v55" } From 89ecb93a48f3f0d35b23e4383590f7e9228da8a4 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 16 Jun 2025 11:54:29 -0600 Subject: [PATCH 2/7] fix: remove armv7 --- .github/workflows/pypi.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index d579aec..cd52e82 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -25,8 +25,6 @@ jobs: manylinux: auto - target: aarch64 manylinux: "2_28" - - target: armv7 - manylinux: auto - target: s390x manylinux: auto - target: ppc64le From dc709bebac934085a81df872472c9f128feba05b Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 16 Jun 2025 13:07:18 -0600 Subject: [PATCH 3/7] fix: remove more linux targets --- .github/workflows/pypi.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index cd52e82..5eb94a5 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -25,8 +25,6 @@ jobs: manylinux: auto - target: aarch64 manylinux: "2_28" - - target: s390x - manylinux: auto - target: ppc64le manylinux: auto steps: From 19d4f0ef32fcd3044c22f62a623ac742897d1384 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 16 Jun 2025 13:16:40 -0600 Subject: [PATCH 4/7] fix: build on more modern manylinux --- .github/workflows/pypi.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index 5eb94a5..dc9c181 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -18,15 +18,13 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - platform: - - target: x86_64 - manylinux: auto - - target: x86 - manylinux: auto - - target: aarch64 - manylinux: "2_28" - - target: ppc64le - manylinux: auto + target: + - x86_64 + - x86 + - aarch64 + - armv7 + - s390x + - ppc64le steps: - uses: actions/checkout@v4 with: @@ -37,14 +35,14 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - target: ${{ matrix.platform.target }} + target: ${{ matrix.target }} args: --release --out dist -i 3.11 -F pyo3/abi3-py311 -F duckdb-bundled sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - manylinux: ${{ matrix.platform.manylinux }} + manylinux: "2_28" - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-linux-${{ matrix.platform.target }} + name: wheels-linux-${{ matrix.target }} path: dist musllinux: From e50f64d4f3d5669bb4f43e91ca59bf76f89c58a9 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 16 Jun 2025 13:25:33 -0600 Subject: [PATCH 5/7] fix: try something different --- .github/workflows/pypi.yaml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index dc9c181..a7a010f 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -17,14 +17,21 @@ jobs: linux: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - target: - - x86_64 - - x86 - - aarch64 - - armv7 - - s390x - - ppc64le + platform: + - target: x86_64 + manylinux: "2_28" + - target: x86 + manylinux: "2014/2_17" + - target: aarch64 + manylinux: "2_28" + - target: armv7 + manylinux: "2_28" + - target: s390x + manylinux: "2_28" + - target: ppc64le + manylinux: "2_28" steps: - uses: actions/checkout@v4 with: @@ -35,14 +42,14 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - target: ${{ matrix.target }} + target: ${{ matrix.platform.target }} args: --release --out dist -i 3.11 -F pyo3/abi3-py311 -F duckdb-bundled sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - manylinux: "2_28" + manylinux: ${{ matrix.platform.manylinux }} - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-linux-${{ matrix.target }} + name: wheels-linux-${{ matrix.platform.target }} path: dist musllinux: From 2a6da64c738cfffe5a0367983fba70f0a36326eb Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 16 Jun 2025 13:30:25 -0600 Subject: [PATCH 6/7] fix: try just 2014 --- .github/workflows/pypi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index a7a010f..c5ffab0 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -23,7 +23,7 @@ jobs: - target: x86_64 manylinux: "2_28" - target: x86 - manylinux: "2014/2_17" + manylinux: "2014" - target: aarch64 manylinux: "2_28" - target: armv7 From 5b5ba5a18a718134bc7b8675618f5f0ce3179b77 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 16 Jun 2025 13:40:31 -0600 Subject: [PATCH 7/7] fix: drop x86 --- .github/workflows/pypi.yaml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index c5ffab0..1b40bee 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -19,19 +19,12 @@ jobs: strategy: fail-fast: false matrix: - platform: - - target: x86_64 - manylinux: "2_28" - - target: x86 - manylinux: "2014" - - target: aarch64 - manylinux: "2_28" - - target: armv7 - manylinux: "2_28" - - target: s390x - manylinux: "2_28" - - target: ppc64le - manylinux: "2_28" + target: + - x86_64 + - aarch64 + - armv7 + - s390x + - ppc64le steps: - uses: actions/checkout@v4 with: @@ -42,14 +35,14 @@ jobs: - name: Build wheels uses: PyO3/maturin-action@v1 with: - target: ${{ matrix.platform.target }} + target: ${{ matrix.target }} args: --release --out dist -i 3.11 -F pyo3/abi3-py311 -F duckdb-bundled sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - manylinux: ${{ matrix.platform.manylinux }} + manylinux: "2_28" - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-linux-${{ matrix.platform.target }} + name: wheels-linux-${{ matrix.target }} path: dist musllinux: