chore(python): Include s2geography in Python wheel #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

jiayuasu merged 59 commits into apache:main from paleolimbot:package-geography

Sep 9, 2025

.github/workflows/python-wheels.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -36,9 +36,13 @@ concurrency:
  
      group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}

      cancel-in-progress: true

    env:

      # At GEOS updated to 3.14.0

      VCPKG_REF: 5a01de756c28279ddfdd2b061d1c75710a6255fa

    jobs:

      windows-x86_64:

        runs-on: windows-latest

        runs-on: windows-2022

        steps:

          - uses: actions/checkout@v4

    @@ -61,25 +65,17 @@ jobs:
  
            uses: actions/checkout@v4

            with:

              repository: microsoft/vcpkg

              ref: "2025.06.13"

              ref: ${{ env.VCPKG_REF }}

              path: vcpkg

          - name: Bootstrap vcpkg

            shell: bash

            env:

              VCPKG_ROOT: ${{ github.workspace }}/vcpkg

              VCPKG_DEFAULT_TRIPLET: x64-windows-dynamic-release

            run: |

              cd ci/scripts

              ./wheels-bootstrap-vcpkg.sh

          - name: Build and test wheels (sedonadb)

            run: |

              cd ci/scripts

              .\wheels-build-windows.ps1

            env:

              VCPKG_ROOT: ${{ github.workspace }}/vcpkg

              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

    @@ -114,7 +110,7 @@ jobs:
  
            uses: actions/checkout@v4

            with:

              repository: microsoft/vcpkg

              ref: "2025.06.13"

              ref: ${{ env.VCPKG_REF }}

              path: vcpkg

          - name: Build and test wheels (sedonadb)

    @@ -139,8 +135,7 @@ jobs:
  
          matrix:

            config:

              - {os: "ubuntu-latest", label: "linux-x86_64", arch: "x86_64"}

              # We can't include this in our CI config until the repository is public

              # - {os: "ubuntu-24.04-arm", label: "linux-arm64", arch: "aarch64"}

              - {os: "ubuntu-24.04-arm", label: "linux-arm64", arch: "aarch64"}

        steps:

          - uses: actions/checkout@v4

    @@ -168,3 +163,31 @@ jobs:
  
            with:

              name: release-wheels-${{ matrix.config.label }}

              path: python/sedonadb/dist/*.whl

      upload_nightly:

        needs: ["wheels-linux", "macOS-arm64", "windows-x86_64"]

        name: Upload nightly packages

        runs-on: "macos-latest"

        steps:

          - uses: actions/download-artifact@v4

            with:

              pattern: release-*

              merge-multiple: true

              path: dist

          - name: Install gemfury client

            run: |

              brew tap gemfury/tap

              brew install fury-cli

              fury --version

          - name: Upload packages to Gemfury

            if: github.repository == 'apache/sedona-db' && github.ref == 'refs/heads/main'

            shell: bash

            run: |

              fury push \

                --api-token=${GEMFURY_PUSH_TOKEN} \

                --as="sedona-nightlies" \

                dist/*

            env:

              NANOARROW_GEMFURY_TOKEN: ${{ secrets.GEMFURY_PUSH_TOKEN }}

.github/workflows/python.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,13 @@ on: @@
       pull_request:
         branches:
           - main
+        paths:
+          - 'Cargo.toml'
+          - 'Cargo.lock'
+          - '.github/workflows/python.yml'
+          - 'rust/**'
+          - 'c/**'
+          - 'python/**'
       push:
         branches:
           - main
@@ Expand All / @@ -36,6 +43,10 @@ defaults: @@
       run:
         shell: bash -l -eo pipefail {0}
+    env:
+      # At GEOS updated to 3.14.0
+      VCPKG_REF: 5a01de756c28279ddfdd2b061d1c75710a6255fa
     jobs:
       test:
         strategy:
@@ Expand All / @@ -55,6 +66,39 @@ jobs: @@
               python-version: '3.x'
               cache: 'pip'
+          - name: Clone vcpkg
+            uses: actions/checkout@v4
+            with:
+              repository: microsoft/vcpkg
+              ref: ${{ env.VCPKG_REF }}
+              path: vcpkg
+          - name: Set up environment variables and bootstrap vcpkg
+            env:
+              VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+              CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+            run: |
+              cd vcpkg
+              ./bootstrap-vcpkg.sh
+              cd ..
+              echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV
+              echo "PATH=$VCPKG_ROOT:$PATH" >> $GITHUB_ENV
+              echo "CMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE" >> $GITHUB_ENV
+          - name: Cache vcpkg binaries
+            id: cache-vcpkg
+            uses: actions/cache@v4
+            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 }}-1
+          - name: Install vcpkg dependencies
+            if: steps.cache-vcpkg.outputs.cache-hit != 'true'
+            run: |
+              ./vcpkg/vcpkg install abseil openssl
           - name: Use stable Rust
             id: rust
             run: |
@@ Expand All / @@ -72,6 +116,7 @@ jobs: @@
           - name: Install
             run: |
+              export MATURIN_PEP517_ARGS="--features s2geography"
               pip install -e "python/sedonadb/[test]" -vv
           - name: Download minimal geoarrow-data assets
@@ Expand Down @@

.github/workflows/rust.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -41,6 +41,10 @@ defaults:
  
      run:

        shell: bash -l -eo pipefail {0}

    env:

      # At GEOS updated to 3.14.0

      VCPKG_REF: 5a01de756c28279ddfdd2b061d1c75710a6255fa

    jobs:

      rust:

        strategy:

    @@ -65,7 +69,7 @@ jobs:
  
            uses: actions/checkout@v4

            with:

              repository: microsoft/vcpkg

              ref: "2025.06.13"

              ref: ${{ env.VCPKG_REF }}

              path: vcpkg

          - name: Set up environment variables and bootstrap vcpkg

    @@ -87,7 +91,7 @@ jobs:
  
            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 }}-2

              key: vcpkg-installed-${{ runner.os }}-${{ runner.arch }}-${{ env.VCPKG_REF }}-1

          - name: Install vcpkg dependencies

            if: steps.cache-vcpkg.outputs.cache-hit != 'true'

c/.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ @@
     # KIND, either express or implied.  See the License for the
     # specific language governing permissions and limitations
     # under the License.
     build/
     dist/
     .cache
+    CMakeUserPresets.json

c/sedona-s2geography/CMakeLists.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -251,32 +251,60 @@ install(FILES "${CMAKE_BINARY_DIR}/openssl_libraries.txt" @@
     # .a file (but this might not work if the absl libraries weren't static,
     # as they aren't on Homebrew and linux distributions).
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      set(LINK_CXX_STANDARD_LIB "-lc++")
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-      set(LINK_CXX_STANDARD_LIB "-lstdc++")
-    elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-      # set MSVC-specific flags if we need them
-    else()
-      set(LINK_CXX_STANDARD_LIB "")
-    endif()
+    if(NOT WIN32)
+      if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        set(LINK_CXX_STANDARD_LIB "-lc++")
+      elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        set(LINK_CXX_STANDARD_LIB "-lstdc++")
+      elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+        # set MSVC-specific flags if we need them
+        set(LINK_CXX_STANDARD_LIB "")
+      else()
+        set(LINK_CXX_STANDARD_LIB "")
+      endif()
-    set(CMAKE_ECHO_STANDARD_LIBRARIES ${CMAKE_CXX_STANDARD_LIBRARIES})
-    set(CMAKE_ECHO_FLAGS ${CMAKE_CXX_FLAGS})
-    set(CMAKE_ECHO_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS})
-    set(CMAKE_ECHO_IMPLICIT_LINK_DIRECTORIES ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
-    # TODO: This won't work on Windows
-    set(CMAKE_ECHO_LINK_EXECUTABLE
-        "sh -c \"echo <FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> ${LINK_CXX_STANDARD_LIB} > <TARGET>\""
-    )
+      set(CMAKE_ECHO_STANDARD_LIBRARIES ${CMAKE_CXX_STANDARD_LIBRARIES})
+      set(CMAKE_ECHO_FLAGS ${CMAKE_CXX_FLAGS})
+      set(CMAKE_ECHO_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS})
+      set(CMAKE_ECHO_IMPLICIT_LINK_DIRECTORIES ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
-    add_executable(linker_flags "CMakeLists.txt")
-    target_link_libraries(linker_flags
-                          OpenSSL::SSL
-                          OpenSSL::Crypto
-                          ${S2_EXTRA_OPENSSL_LIBS}
-                          ${ABSL_LIBRARIES})
+      set(CMAKE_ECHO_LINK_EXECUTABLE
+          "sh -c \"echo <FLAGS> <LINK_FLAGS> <LINK_LIBRARIES> ${LINK_CXX_STANDARD_LIB} > <TARGET>\""
+      )
-    set_target_properties(linker_flags PROPERTIES LINKER_LANGUAGE ECHO SUFFIX ".txt")
+      add_executable(linker_flags "CMakeLists.txt")
+      target_link_libraries(linker_flags
+                            OpenSSL::SSL
+                            OpenSSL::Crypto
+                            ${S2_EXTRA_OPENSSL_LIBS}
+                            ${ABSL_LIBRARIES})
-    install(TARGETS linker_flags DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+      set_target_properties(linker_flags PROPERTIES LINKER_LANGUAGE ECHO SUFFIX ".txt")
+      install(TARGETS linker_flags DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+    else()
+      # On Windows, MSBuild will write this file for us, but we have to look in a very specific place
+      # to find it. This is possibly brittle but makes it possible to build this on Windows at all.
+      file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/linker_flags.cc"
+           "
+    int main(int argc, const char** args) {
+      return 0;
+    }")
+      add_executable(linker_flags "${CMAKE_CURRENT_BINARY_DIR}/linker_flags.cc")
+      target_link_libraries(linker_flags
+                            OpenSSL::SSL
+                            OpenSSL::Crypto
+                            ${S2_EXTRA_OPENSSL_LIBS}
+                            ${ABSL_LIBRARIES})
+      add_custom_command(TARGET linker_flags
+                         POST_BUILD
+                         COMMAND ${CMAKE_COMMAND} -E copy
+                                 "${CMAKE_CURRENT_BINARY_DIR}/linker_flags.dir/$<CONFIG>/linker_flags.tlog/link.command.1.tlog"
+                                 "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/linker_flags.txt"
+                         COMMENT "Copying linker command file for configuration $<CONFIG>")
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/linker_flags.txt"
+              DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+    endif()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(python): Include s2geography in Python wheel #17

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!