feat: update cli wheels, always bundle duckdb (#631)

Hoping to fix #630

Author: gadomski

.github/workflows/python-cli.yml

@@ -19,14 +19,24 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: x86_64
-          - runner: ubuntu-latest
+            manylinux: auto
+          - runner: ubuntu-22.04
             target: x86
-          - runner: ubuntu-latest
+            manylinux: auto
+          - runner: ubuntu-22.04
+            target: aarch64
+            manylinux: "2_28"
+          - runner: ubuntu-22.04
             target: armv7
-          - runner: ubuntu-latest
+            manylinux: auto
+          - runner: ubuntu-22.04
+            target: s390x
+            manylinux: auto
+          - runner: ubuntu-22.04
             target: ppc64le
+            manylinux: auto
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -36,9 +46,9 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
+          args: --release --out dist --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
           sccache: "true"
-          manylinux: auto
+          manylinux: ${{ matrix.platform.manylinux }}
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
@@ -50,13 +60,13 @@ jobs:
     strategy:
       matrix:
         platform:
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: x86_64
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: x86
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: aarch64
-          - runner: ubuntu-latest
+          - runner: ubuntu-22.04
             target: armv7
     steps:
       - uses: actions/checkout@v4
@@ -67,7 +77,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
+          args: --release --out dist --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
           sccache: "true"
           manylinux: musllinux_1_2
       - name: Upload wheels
@@ -95,7 +105,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
+          args: --release --out dist --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
@@ -121,7 +131,7 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
+          args: --release --out dist --manifest-path crates/cli/Cargo.toml -F duckdb/bundled
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
@@ -148,7 +158,7 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
-    needs: [linux, musllinux, macos, sdist]
+    needs: [linux, musllinux, windows, macos, sdist]
     environment:
       name: pypi
       url: https://pypi.org/p/stacrs-cli
@@ -159,10 +169,12 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
       - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest-build-provenance@v1
         with:
           subject-path: "wheels-*/*"
-      - uses: PyO3/maturin-action@v1
+      - name: Publish to PyPI
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: PyO3/maturin-action@v1
         with:
           command: upload
           args: --non-interactive --skip-existing wheels-*/*

crates/cli/CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [0.5.1] - 2025-01-31
+
+### Changed
+
+- Always bundle DuckDB (again) ([#631](https://github.com/stac-utils/stac-rs/pull/631))
+
 ## [0.5.0] - 2025-01-31
 
 ### Changed
@@ -110,7 +116,8 @@ Moved over from [stac-incubator-rs](https://github.com/gadomski/stac-incubator-r
 - Downloading ([#142](https://github.com/stac-utils/stac-rs/pull/142), [#152](https://github.com/stac-utils/stac-rs/pull/152))
 - Validation ([#155](https://github.com/stac-utils/stac-rs/pull/155))
 
-[Unreleased]: https://github.com/stac-utils/stac-rs/compare/stac-cli-v0.5.0..main
+[Unreleased]: https://github.com/stac-utils/stac-rs/compare/stac-cli-v0.5.1..main
+[0.5.1]: https://github.com/stac-utils/stac-rs/compare/stac-cli-v0.5.0..stac-cli-v0.5.1
 [0.5.0]: https://github.com/stac-utils/stac-rs/compare/stac-cli-v0.4.1..stac-cli-v0.5.0
 [0.4.1]: https://github.com/stac-utils/stac-rs/compare/stac-cli-v0.4.0..stac-cli-v0.4.1
 [0.4.0]: https://github.com/stac-utils/stac-rs/compare/stac-cli-v0.3.1..stac-cli-v0.4.0

crates/cli/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "stac-cli"
 description = "Command line interface for stac-rs"
-version = "0.5.0"
+version = "0.5.1-rc.0"
 keywords = ["geospatial", "stac", "metadata", "geo", "raster"]
 authors.workspace = true
 edition.workspace = true
@@ -20,9 +20,10 @@ python = ["dep:pyo3", "pgstac"]
 anyhow.workspace = true
 axum.workspace = true
 clap = { workspace = true, features = ["derive"] }
-duckdb.workspace = true  # we depend on it directly so that we can bundle it for the Python wheels
+duckdb = { workspace = true }
+libduckdb-sys = { workspace = true }
 object_store.workspace = true
-pyo3 = { workspace = true, optional = true }
+pyo3 = { workspace = true, optional = true, features = ["abi3-py39"] }
 reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true

crates/cli/pyproject.toml

@@ -7,7 +7,7 @@ name = "stacrs-cli"
 description = "A STAC command-line interface written in Rust"
 readme = "README.md"
 authors = [{ name = "Pete Gadomski", email = "pete.gadomski@gmail.com" }]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Science/Research",

crates/cli/src/lib.rs

@@ -1,6 +1,7 @@
 use anyhow::{anyhow, Error, Result};
 use clap::{Parser, Subcommand};
 use duckdb as _;
+use libduckdb_sys as _;
 use stac::{geoparquet::Compression, Collection, Format, Item, Links, Migrate, Validate};
 use stac_api::{GetItems, GetSearch, Search};
 use stac_server::Backend;