BLD/RLS: update wheels to include GDAL 3.10.2 (#524)

Author: jorisvandenbossche

.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
     needs: [build-sdist]
     runs-on: ubuntu-latest
     container:
-      image: "ghcr.io/osgeo/gdal:ubuntu-small-3.10.0"
+      image: "ghcr.io/osgeo/gdal:ubuntu-small-3.10.2"
 
     steps:
       - name: Install packages
@@ -184,7 +184,7 @@ jobs:
           path: |
             ${{ matrix.vcpkg_cache }}
           # bump the last digit to avoid using previous build cache
-          key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.10.0-cache0
+          key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.10.2-cache0
 
       # MacOS build requires aclocal, which is part of automake, but appears
       # to be missing in default image
@@ -202,7 +202,7 @@ jobs:
           git reset --hard
           # pull specific commit with desired GDAL version
           git pull
-          git checkout 0857a4b08c14030bbe41e80accb2b1fddb047a74
+          git checkout d24ce43972a16be005ba1458eed67d071d44dc1c
 
       - name: Install GDAL
         env:

CHANGES.md

@@ -13,7 +13,7 @@
 
 ### Packaging
 
--   The GDAL library included in the wheels is upgraded from 3.9.2 to 3.10.0 (#499).
+-   The GDAL library included in the wheels is upgraded from 3.9.2 to 3.10.2 (#499).
 
 ## 0.10.0 (2024-09-28)
 

ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux2014_x86_64:2024-08-12-7fde9b1
+FROM quay.io/pypa/manylinux2014_x86_64:2025-01-11-3165879
 
 # building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988)
 RUN yum install -y curl unzip zip tar perl-IPC-Cmd
@@ -7,7 +7,7 @@ RUN yum install -y curl unzip zip tar perl-IPC-Cmd
 RUN ln -s /opt/python/cp38-cp38/bin/python3 /usr/bin/python3
 
 RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \
-    git -C /opt/vcpkg checkout 0857a4b08c14030bbe41e80accb2b1fddb047a74
+    git -C /opt/vcpkg checkout cd1099f42a3c2ee28dc68e3db3f6f88658982736
 
 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
 ENV PATH="${PATH}:/opt/vcpkg"

ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile

@@ -1,10 +1,10 @@
-FROM quay.io/pypa/manylinux_2_28_aarch64:2024-08-12-7fde9b1
+FROM quay.io/pypa/manylinux_2_28_aarch64:2025-01-11-3165879
 
 # building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988)
 RUN dnf -y install curl zip unzip tar ninja-build perl-IPC-Cmd
 
 RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \
-    git -C /opt/vcpkg checkout 0857a4b08c14030bbe41e80accb2b1fddb047a74
+    git -C /opt/vcpkg checkout d24ce43972a16be005ba1458eed67d071d44dc1c
 
 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
 ENV PATH="${PATH}:/opt/vcpkg"

ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile

@@ -1,10 +1,10 @@
-FROM quay.io/pypa/manylinux_2_28_x86_64:2024-08-12-7fde9b1
+FROM quay.io/pypa/manylinux_2_28_x86_64:2025-01-11-3165879
 
 # building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988)
 RUN dnf -y install curl zip unzip tar ninja-build perl-IPC-Cmd
 
 RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \
-    git -C /opt/vcpkg checkout 0857a4b08c14030bbe41e80accb2b1fddb047a74
+    git -C /opt/vcpkg checkout d24ce43972a16be005ba1458eed67d071d44dc1c
 
 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
 ENV PATH="${PATH}:/opt/vcpkg"

ci/vcpkg.json

@@ -8,5 +8,5 @@
             "features": ["recommended-features", "curl", "geos", "iconv", "openssl"]
         }
     ],
-    "builtin-baseline": "0857a4b08c14030bbe41e80accb2b1fddb047a74"
+    "builtin-baseline": "d24ce43972a16be005ba1458eed67d071d44dc1c"
 }

pyproject.toml

@@ -51,7 +51,7 @@ build-verbosity = 3
 VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/$VCPKG_DEFAULT_TRIPLET"
 GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
 GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
-GDAL_VERSION = "3.10.0"
+GDAL_VERSION = "3.10.2"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -66,7 +66,7 @@ repair-wheel-command = [
 VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/$VCPKG_DEFAULT_TRIPLET"
 GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
 GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
-GDAL_VERSION = "3.10.0"
+GDAL_VERSION = "3.10.2"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -80,7 +80,7 @@ repair-wheel-command = "delvewheel repair --add-path C:/vcpkg/installed/x64-wind
 VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-dynamic-release"
 GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
 GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
-GDAL_VERSION = "3.10.0"
+GDAL_VERSION = "3.10.2"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"