Merge branch 'apache:main' into st_exteriorRing

Author: LakshmiSowmya04

.github/workflows/dev.yml

@@ -52,7 +52,7 @@ jobs:
           rustc -V
           cargo -V
       - name: pre-commit (cache)
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.cache/pre-commit
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/examples.yml

@@ -66,7 +66,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           # Update this key to force a new cache
-          prefix-key: "rust-${{ matrix.name }}-v4"
+          prefix-key: "rust-${{ matrix.name }}-v5"
 
       - name: Install dependencies
         shell: bash
@@ -76,6 +76,15 @@ jobs:
       - name: Build and run examples/sedonadb-rust
         shell: bash
         run: |
-          rm -rf Cargo.toml
           cd examples/sedonadb-rust
+          # Use current PR/branch commit instead of main branch
+          if [ -n "${{ github.event.pull_request.head.sha }}" ]; then
+            REV="${{ github.event.pull_request.head.sha }}"
+            REPO="${{ github.event.pull_request.head.repo.full_name }}"
+          else
+            REV="${{ github.sha }}"
+            REPO="apache/sedona-db"
+          fi
+          sed -i "s|git = \"https://github.com/apache/sedona-db.git\"|git = \"https://github.com/${REPO}.git\", rev = \"${REV}\"|" Cargo.toml
+          cat Cargo.toml
           cargo run

.github/workflows/packaging.yml

@@ -75,7 +75,7 @@ jobs:
         run: |
           dev/release/run-rat.sh apache-sedona-db-${{ env.VERSION }}.tar.gz
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: source
           retention-days: 7
@@ -98,6 +98,8 @@ jobs:
         with:
           python-version: "3.x"
 
+      - uses: quarto-dev/quarto-actions/setup@v2
+
       - name: Use stable Rust
         id: rust
         run: |
@@ -111,15 +113,15 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           # Update this key to force a new cache (but share with the python.yml workflow)
-          prefix-key: "python-v2"
+          prefix-key: "python-v3"
 
       - name: Install docs requirements
         run: |
             pip install -r docs/requirements.txt
 
       - name: Install dev SedonaDB Python
         run: |
-            pip install python/sedonadb/ -vv
+            pip install "python/sedonadb/[geopandas]" -v
 
       - name: Build documentation
         run: |
@@ -131,7 +133,7 @@ jobs:
           tar -czf docs.tgz sedona-db-docs
 
       - name: Upload docs
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: docs
           retention-days: 2
@@ -163,7 +165,7 @@ jobs:
 
     steps:
       - name: Get all artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           path: release-artifacts
 

.github/workflows/python-wheels.yml

@@ -60,7 +60,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           # Update this key to force a new cache
-          prefix-key: "python-wheel-windows-latest-v2"
+          prefix-key: "python-wheel-windows-latest-v3"
 
       - name: Clone vcpkg
         uses: actions/checkout@v6
@@ -89,11 +89,10 @@ jobs:
           VCPKG_DEFAULT_TRIPLET: x64-windows-dynamic-release
           CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
           CIBW_BUILD: "*-win_amd64"
-          CIBW_TEST_SKIP: "cp314* cp38*"
           CIBW_TEST_REQUIRES: pytest adbc_driver_manager geoarrow-pyarrow geopandas
           CIBW_TEST_COMMAND: pytest {package}/tests -vv
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: release-wheels-windows-x86_64
           path: python/sedonadb/dist/*.whl
@@ -143,15 +142,68 @@ jobs:
           ./wheels-build-macos.sh sedonadb
         env:
           VCPKG_ROOT: ${{ github.workspace }}/vcpkg
-          CIBW_TEST_SKIP: "cp314*"
           CIBW_TEST_REQUIRES: pytest adbc_driver_manager geoarrow-pyarrow geopandas duckdb
           CIBW_TEST_COMMAND: pytest {package}/tests -vv
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: release-wheels-macOS-arm64
           path: python/sedonadb/dist/*.whl
 
+  macOS-amd64:
+    runs-on: macos-15-intel
+
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: 'true'
+          fetch-depth: 0
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
+
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==3.1.4
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          # Update this key to force a new cache
+          prefix-key: "python-wheel-macOS-latest-v2"
+
+      - name: Clone vcpkg
+        uses: actions/checkout@v6
+        with:
+          repository: microsoft/vcpkg
+          ref: ${{ env.VCPKG_REF }}
+          path: vcpkg
+
+      - name: Set SedonaDB dev version
+        shell: bash
+        run: |
+          # Set the unique development version anywhere except a release branch
+          if [[ "${GITHUB_REF##*/}" =~ ^branch-[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            version="${GITHUB_REF##*/branch-}"
+            echo "${version}"
+          else
+            python ci/scripts/set_dev_version.py
+          fi
+
+      - name: Build and test wheels (sedonadb)
+        run: |
+          cd ci/scripts
+          ./wheels-build-macos.sh sedonadb
+        env:
+          VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+          CIBW_TEST_REQUIRES: pytest adbc_driver_manager geoarrow-pyarrow geopandas duckdb
+          CIBW_TEST_COMMAND: pytest {package}/tests -vv
+          SEDONADB_MACOS_ARCH: x86_64
+
+      - uses: actions/upload-artifact@v6
+        with:
+          name: release-wheels-macOS-amd64
+          path: python/sedonadb/dist/*.whl
+
   wheels-linux:
     name: ${{ matrix.config.label }}
     runs-on: ${{ matrix.config.os }}
@@ -191,21 +243,20 @@ jobs:
           ./wheels-build-linux.sh ${{ matrix.config.arch }} sedonadb
         env:
           CIBW_SKIP: "*musllinux*"
-          CIBW_TEST_SKIP: "cp314*"
           CIBW_TEST_REQUIRES: pytest adbc_driver_manager geoarrow-pyarrow geopandas duckdb
           CIBW_TEST_COMMAND: pytest {package}/tests -vv
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: release-wheels-${{ matrix.config.label }}
           path: python/sedonadb/dist/*.whl
 
   upload_nightly:
-    needs: ["wheels-linux", "macOS-arm64", "windows-x86_64"]
+    needs: ["wheels-linux", "macOS-arm64", "macOS-amd64", "windows-x86_64"]
     name: Upload nightly packages
     runs-on: "macos-latest"
     steps:
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
         with:
           pattern: release-*
           merge-multiple: true

.github/workflows/python.yml

@@ -88,11 +88,11 @@ jobs:
 
       - name: Cache vcpkg binaries
         id: cache-vcpkg
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: vcpkg/packages
           # Bump the number at the end of this line to force a new dependency build
-          key: vcpkg-installed-${{ runner.os }}-${{ runner.arch }}-${{ env.VCPKG_REF }}-2
+          key: vcpkg-installed-${{ runner.os }}-${{ runner.arch }}-${{ env.VCPKG_REF }}-3
 
       - name: Install vcpkg dependencies
         if: steps.cache-vcpkg.outputs.cache-hit != 'true'
@@ -112,7 +112,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           # Update this key to force a new cache (sync with packaging.yml)
-          prefix-key: "python-v2"
+          prefix-key: "python-v3"
 
       - name: Install
         run: |

.github/workflows/r.yml

@@ -32,6 +32,14 @@ on:
       - 'c/**'
       - 'r/**'
 jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      # Run air format
+      - run: curl -LsSf https://github.com/posit-dev/air/releases/latest/download/air-installer.sh | sh
+      - run: cd r/sedonadb && air format . --check
 
   test:
     runs-on: ${{ matrix.config.os }}
@@ -86,7 +94,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           # Update this key to force a new cache
-          prefix-key: "r-v3"
+          prefix-key: "r-v4"
           # The R package uses its own target directory
           workspaces: ". -> r/sedonadb/src/rust/target"