Merge branch 'main' into feat-gdal-is-back

stac-utils · Dec 18, 2024 · 8934e0d · 8934e0d
2 parents e956586 + 3e736d0
commit 8934e0d
Show file tree

Hide file tree

Showing 6 changed files with 197 additions and 138 deletions.
diff --git a/.github/workflows/python-cli.yml b/.github/workflows/python-cli.yml
@@ -1,4 +1,4 @@
-name: Python CLI
+name: PyPI
 
 on:
   push:
@@ -14,17 +14,140 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-wheels:
-    uses: ./.github/workflows/wheels.yml
-    with:
-      manifest-path: crates/cli/Cargo.toml
+  linux:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: ubuntu-latest
+            target: x86_64
+          - runner: ubuntu-latest
+            target: x86
+          - runner: ubuntu-latest
+            target: armv7
+          - runner: ubuntu-latest
+            target: ppc64le
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml
+          sccache: "true"
+          manylinux: auto
+          # https://github.com/Intreecom/scyllapy/blob/05fdab32dd7468c26533de5fdfe9627fa3e38445/.github/workflows/release.yaml#L37-L50
+          before-script-linux: |
+            # If we're running on rhel centos, install needed packages.
+            if command -v yum &> /dev/null; then
+                yum update -y && yum install -y perl-core openssl openssl-devel pkgconfig libatomic
+
+                # If we're running on i686 we need to symlink libatomic
+                # in order to build openssl with -latomic flag.
+                if [[ ! -d "/usr/lib64" ]]; then
+                    ln -s /usr/lib/libatomic.so.1 /usr/lib/libatomic.so
+                fi
+            else
+                # If we're running on debian-based system.
+                apt update -y && apt-get install -y libssl-dev openssl pkg-config
+            fi
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-${{ matrix.platform.target }}
+          path: dist
+
+  musllinux:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: ubuntu-latest
+            target: x86_64
+          - runner: ubuntu-latest
+            target: x86
+          - runner: ubuntu-latest
+            target: aarch64
+          - runner: ubuntu-latest
+            target: armv7
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml
+          sccache: "true"
+          manylinux: musllinux_1_2
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-musllinux-${{ matrix.platform.target }}
+          path: dist
+
+  windows:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: windows-latest
+            target: x64
+          - runner: windows-latest
+            target: x86
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+          architecture: ${{ matrix.platform.target }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml
+          sccache: "true"
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-windows-${{ matrix.platform.target }}
+          path: dist
+
+  macos:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: macos-13
+            target: x86_64
+          - runner: macos-14
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter --manifest-path crates/cli/Cargo.toml
+          sccache: "true"
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-macos-${{ matrix.platform.target }}
+          path: dist
 
   sdist:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Rust cache
-        uses: Swatinem/rust-cache@v2
       - name: Build sdist
         uses: PyO3/maturin-action@v1
         with:
@@ -33,28 +156,28 @@ jobs:
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
-          name: pypi_files_sdist
+          name: wheels-sdist
           path: dist
 
   release:
     name: Release
     runs-on: ubuntu-latest
-    if: success() && startsWith(github.ref, 'refs/tags/')
-    needs:
-      - build-wheels
-      - sdist
+    if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
+    needs: [linux, musllinux, macos, sdist]
     environment:
       name: pypi
       url: https://pypi.org/p/stacrs-cli
     permissions:
       id-token: write
+      contents: write
+      attestations: write
     steps:
       - uses: actions/download-artifact@v4
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
         with:
-          pattern: pypi_files_*
-          merge-multiple: true
-      - name: Publish to PyPI
-        uses: PyO3/maturin-action@v1
+          subject-path: "wheels-*/*"
+      - uses: PyO3/maturin-action@v1
         with:
           command: upload
-          args: --non-interactive --skip-existing stacrs-cli-*
+          args: --non-interactive --skip-existing wheels-*/*
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
diff --git a/crates/core/CHANGELOG.md b/crates/core/CHANGELOG.md
@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `Fields` trait impl for `Link` ([#542](https://github.com/stac-utils/stac-rs/pull/542))
 
+### Fixed
+
+- Set user agent for validation client ([#572](https://github.com/stac-utils/stac-rs/pull/572))
+
 ## [0.11.0] - 2024-11-12
 
 ### Added

diff --git a/crates/core/src/validate/validator.rs b/crates/core/src/validate/validator.rs
@@ -61,6 +61,11 @@ impl Validator {
                 Client::builder()
             }
         };
+        let client_builder = client_builder.user_agent(concat!(
+            env!("CARGO_PKG_NAME"),
+            "/",
+            env!("CARGO_PKG_VERSION"),
+        ));
         Ok(Validator {
             schemas: Arc::new(RwLock::new(schemas(&validation_options))),
             validation_options,

diff --git a/crates/pgstac/CHANGELOG.md b/crates/pgstac/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - `Pgstac` trait ([#551](https://github.com/stac-utils/stac-rs/pull/551))
 - `python` feature ([#558](https://github.com/stac-utils/stac-rs/pull/558))
+- `readonly` ([#570](https://github.com/stac-utils/stac-rs/pull/570))
 
 ### Changed