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/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml index d579aec..1b40bee 100644 --- a/.github/workflows/pypi.yaml +++ b/.github/workflows/pypi.yaml @@ -17,20 +17,14 @@ jobs: linux: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - platform: - - target: x86_64 - manylinux: auto - - target: x86 - manylinux: auto - - target: aarch64 - manylinux: "2_28" - - target: armv7 - manylinux: auto - - target: s390x - manylinux: auto - - target: ppc64le - manylinux: auto + target: + - x86_64 + - aarch64 + - armv7 + - s390x + - ppc64le steps: - uses: actions/checkout@v4 with: @@ -41,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: 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" }