BLD/RLS: update wheels to include GDAL 3.8.3

geopandas · Jan 25, 2024 · 11cd9ae · 11cd9ae
1 parent db1808d
commit 11cd9ae
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
     needs: [build-sdist]
     runs-on: ubuntu-latest
     container:
-      image: "ghcr.io/osgeo/gdal:ubuntu-small-3.7.2"
+      image: "ghcr.io/osgeo/gdal:ubuntu-small-3.8.3"
 
     steps:
       - name: Download sdist from artifacts
@@ -155,7 +155,7 @@ jobs:
           path: |
             ${{ matrix.vcpkg_cache }}
           # bump the last digit to avoid using previous build cache
-          key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.7.2-cache0
+          key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.8.3-cache0
 
       # MacOS build requires aclocal, which is part of automake, but appears
       # to be missing in default image
@@ -171,9 +171,9 @@ jobs:
           cd $VCPKG_INSTALLATION_ROOT
           # on mac the clone is not clean, otherwise git pull fails
           git reset --hard
-          # pull latest version to ensure the required commit with GDAL 3.7 is available
+          # pull latest version to ensure the required commit with GDAL 3.8 is available
           git pull
-          git checkout 62988594de235334bc83609a060773eb2c8a8478
+          git checkout 6df4d4f49866212aa00fcd85fde5356503dafed1
 
       - name: Install GDAL
         env:

diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,10 @@
 -   Fix error in `write_dataframe` if input has a date column and
     non-consecutive index values (#325).
 
+### Packaging
+
+-   The GDAL library included in the wheels is updated from 3.7.2 to GDAL 3.8.3.
+
 ## 0.7.2 (2023-10-30)
 
 ### Bug fixes

diff --git a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux2014_x86_64:2023-09-24-36b93e4
+FROM quay.io/pypa/manylinux2014_x86_64:2024-01-23-12ffabc
 
 # 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 62988594de235334bc83609a060773eb2c8a8478
+    git -C /opt/vcpkg checkout 6df4d4f49866212aa00fcd85fde5356503dafed1
 
 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
 ENV PATH="${PATH}:/opt/vcpkg"

diff --git a/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile b/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/pypa/manylinux_2_28_aarch64:2023-09-24-36b93e4
+FROM quay.io/pypa/manylinux_2_28_aarch64:2024-01-23-12ffabc
 
 # 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
@@ -7,7 +7,7 @@ RUN dnf -y install curl zip unzip tar ninja-build 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 62988594de235334bc83609a060773eb2c8a8478
+    git -C /opt/vcpkg checkout 6df4d4f49866212aa00fcd85fde5356503dafed1
 
 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
 ENV PATH="${PATH}:/opt/vcpkg"

diff --git a/ci/vcpkg.json b/ci/vcpkg.json
@@ -8,5 +8,5 @@
             "features": ["recommended-features", "curl", "geos"]
         }
     ],
-    "builtin-baseline": "62988594de235334bc83609a060773eb2c8a8478"
+    "builtin-baseline": "6df4d4f49866212aa00fcd85fde5356503dafed1"
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,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.7.2"
+GDAL_VERSION = "3.8.3"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -36,7 +36,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.7.2"
+GDAL_VERSION = "3.8.3"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -49,7 +49,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.7.2"
+GDAL_VERSION = "3.8.3"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"