From 9349e37615d0ea198f8d356a2aeb4ed3b1627c95 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 22 Apr 2025 15:03:12 +0200 Subject: [PATCH 1/3] BLD/RLS: update wheels to include GDAL 3.10.3 --- .github/workflows/release.yml | 6 +++--- CHANGES.md | 2 +- ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile | 2 +- ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile | 2 +- ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile | 2 +- ci/vcpkg.json | 2 +- pyproject.toml | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7241ffc9..a9ff4b54 100644 --- a/.github/workflows/release.yml +++ b/.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.2" + image: "ghcr.io/osgeo/gdal:ubuntu-small-3.10.3" 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.2-cache0 + key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.10.3-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 d24ce43972a16be005ba1458eed67d071d44dc1c + git checkout 5fe984bb224cb875c17ba26af24354eaba2a28c9 - name: Install GDAL env: diff --git a/CHANGES.md b/CHANGES.md index e9bbc934..5e1adb8f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,7 @@ ### Packaging -- The GDAL library included in the wheels is upgraded from 3.9.2 to 3.10.2 (#499). +- The GDAL library included in the wheels is upgraded from 3.9.2 to 3.10.3 (#499). ## 0.10.0 (2024-09-28) diff --git a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile index f0d8386e..ec35b9c5 100644 --- a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile @@ -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 cd1099f42a3c2ee28dc68e3db3f6f88658982736 + git -C /opt/vcpkg checkout 5fe984bb224cb875c17ba26af24354eaba2a28c9 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 index 3528a1c3..85137706 100644 --- a/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile @@ -4,7 +4,7 @@ FROM quay.io/pypa/manylinux_2_28_aarch64:2025-01-11-3165879 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 d24ce43972a16be005ba1458eed67d071d44dc1c + git -C /opt/vcpkg checkout 5fe984bb224cb875c17ba26af24354eaba2a28c9 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" ENV PATH="${PATH}:/opt/vcpkg" diff --git a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile index 5e157fc4..4d3a93de 100644 --- a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile @@ -4,7 +4,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64:2025-01-11-3165879 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 d24ce43972a16be005ba1458eed67d071d44dc1c + git -C /opt/vcpkg checkout 5fe984bb224cb875c17ba26af24354eaba2a28c9 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" ENV PATH="${PATH}:/opt/vcpkg" diff --git a/ci/vcpkg.json b/ci/vcpkg.json index e9298dbf..d6ef323e 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -8,5 +8,5 @@ "features": ["recommended-features", "curl", "geos", "iconv", "openssl"] } ], - "builtin-baseline": "d24ce43972a16be005ba1458eed67d071d44dc1c" + "builtin-baseline": "5fe984bb224cb875c17ba26af24354eaba2a28c9" } diff --git a/pyproject.toml b/pyproject.toml index cebdd904..3ff2aac3 100644 --- a/pyproject.toml +++ b/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.2" +GDAL_VERSION = "3.10.3" 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.2" +GDAL_VERSION = "3.10.3" 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.2" +GDAL_VERSION = "3.10.3" PYOGRIO_PACKAGE_DATA = 1 GDAL_DATA = "$VCPKG_INSTALL/share/gdal" PROJ_LIB = "$VCPKG_INSTALL/share/proj" From 4ced819a8ab025c868c95d7e621e37b6806cbef5 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 23 Apr 2025 09:49:49 +0200 Subject: [PATCH 2/3] try newer commit for pkgconf issue on linux --- .github/workflows/release.yml | 2 +- ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile | 2 +- ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile | 2 +- ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile | 2 +- ci/vcpkg.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9ff4b54..472797da 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -202,7 +202,7 @@ jobs: git reset --hard # pull specific commit with desired GDAL version git pull - git checkout 5fe984bb224cb875c17ba26af24354eaba2a28c9 + git checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 - name: Install GDAL env: diff --git a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile index ec35b9c5..0df57ceb 100644 --- a/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile @@ -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 5fe984bb224cb875c17ba26af24354eaba2a28c9 + git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 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 index 85137706..28a65011 100644 --- a/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile @@ -4,7 +4,7 @@ FROM quay.io/pypa/manylinux_2_28_aarch64:2025-01-11-3165879 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 5fe984bb224cb875c17ba26af24354eaba2a28c9 + git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" ENV PATH="${PATH}:/opt/vcpkg" diff --git a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile index 4d3a93de..9966903c 100644 --- a/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile +++ b/ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile @@ -4,7 +4,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64:2025-01-11-3165879 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 5fe984bb224cb875c17ba26af24354eaba2a28c9 + git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6 ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg" ENV PATH="${PATH}:/opt/vcpkg" diff --git a/ci/vcpkg.json b/ci/vcpkg.json index d6ef323e..34c6f997 100644 --- a/ci/vcpkg.json +++ b/ci/vcpkg.json @@ -8,5 +8,5 @@ "features": ["recommended-features", "curl", "geos", "iconv", "openssl"] } ], - "builtin-baseline": "5fe984bb224cb875c17ba26af24354eaba2a28c9" + "builtin-baseline": "66c1c9852bb30bd87285e77cc775072046d51fc6" } From bf9b96ce48acda1f6d8d7b870de51256112025b6 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 24 Apr 2025 11:09:55 +0200 Subject: [PATCH 3/3] ubuntu-20.04 -> 22.04 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 472797da..fd707ad4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -242,7 +242,7 @@ jobs: os: [ "ubuntu-latest", - "ubuntu-20.04", + "ubuntu-22.04", "windows-latest", "macos-13", "macos-latest", @@ -253,7 +253,7 @@ jobs: artifact: pyogrio-wheel-linux-manylinux2014_x86_64 - os: "ubuntu-latest" artifact: pyogrio-wheel-linux-manylinux_2_28_x86_64 - - os: "ubuntu-20.04" + - os: "ubuntu-22.04" artifact: pyogrio-wheel-linux-manylinux_2_28_x86_64 - os: "windows-latest" artifact: pyogrio-wheel-x64-windows-dynamic-release