BLD/RLS: update wheels to include GDAL 3.6.4 (#248)

geopandas · Apr 26, 2023 · 5759f65 · 5759f65
1 parent 1e9a0ca
commit 5759f65
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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.6.3-cache0
+          key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.6.4-cache0
 
       # MacOS build requires aclocal, which is part of automake, but appears
       # to be missing in default image
@@ -173,7 +173,7 @@ jobs:
           git reset --hard
           # pull latest version to ensure the required commit with GDAL 3.6 is available
           git pull
-          git checkout fe2d921cd5e1c8721e8e2385c35fb3a4ea65e559
+          git checkout 580f143d123ce6abb5c135b11d6402c9a54bc9b9
 
       - name: Install GDAL
         env:

diff --git a/CHANGES.md b/CHANGES.md
@@ -26,7 +26,7 @@
 
 ### Packaging
 
--   The GDAL library included in the wheels is updated from 3.6.2 to GDAL 3.6.3.
+-   The GDAL library included in the wheels is updated from 3.6.2 to GDAL 3.6.4.
 
 ## 0.5.1 (2023-01-26)
 

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-04-02-7bc2fc8
+FROM quay.io/pypa/manylinux2014_x86_64:2023-04-24-82a68e6
 
 # building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988)
 RUN yum install -y curl unzip zip tar perl-IPC-Cmd
@@ -11,6 +11,8 @@ RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg
 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
 ENV PATH="${PATH}:/opt/vcpkg"
 
+ENV VCPKG_DEFAULT_TRIPLET="x64-linux-dynamic"
+
 # mkdir & touch -> workaround for https://github.com/microsoft/vcpkg/issues/27786
 RUN bootstrap-vcpkg.sh && \
     mkdir -p /root/.vcpkg/ $HOME/.vcpkg && \
@@ -24,7 +26,6 @@ COPY ci/vcpkg.json opt/vcpkg/
 
 ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-dynamic/lib"
 RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \
-    --triplet=x64-linux-dynamic \
     --overlay-ports=opt/vcpkg/custom-ports \
     --feature-flags="versions,manifests" \
     --x-manifest-root=opt/vcpkg \

diff --git a/ci/vcpkg.json b/ci/vcpkg.json
@@ -8,5 +8,5 @@
             "features": ["recommended-features", "curl", "geos"]
         }
     ],
-    "builtin-baseline": "fe2d921cd5e1c8721e8e2385c35fb3a4ea65e559"
+    "builtin-baseline": "580f143d123ce6abb5c135b11d6402c9a54bc9b9"
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ build-verbosity = 3
 VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/x64-linux-dynamic"
 GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
 GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
-GDAL_VERSION = "3.6.3"
+GDAL_VERSION = "3.6.4"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -35,7 +35,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.6.3"
+GDAL_VERSION = "3.6.4"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -48,7 +48,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.6.3"
+GDAL_VERSION = "3.6.4"
 PYOGRIO_PACKAGE_DATA = 1
 GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
 PROJ_LIB = "$VCPKG_INSTALL/share/proj"