Skip to content

Commit 22080e8

Browse files
BLD/RLS: update wheels to include GDAL 3.10.3 (#536)
1 parent 156ffc3 commit 22080e8

7 files changed

+13
-13
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
needs: [build-sdist]
5555
runs-on: ubuntu-latest
5656
container:
57-
image: "ghcr.io/osgeo/gdal:ubuntu-small-3.10.2"
57+
image: "ghcr.io/osgeo/gdal:ubuntu-small-3.10.3"
5858

5959
steps:
6060
- name: Install packages
@@ -184,7 +184,7 @@ jobs:
184184
path: |
185185
${{ matrix.vcpkg_cache }}
186186
# bump the last digit to avoid using previous build cache
187-
key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.10.2-cache0
187+
key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.10.3-cache0
188188

189189
# MacOS build requires aclocal, which is part of automake, but appears
190190
# to be missing in default image
@@ -202,7 +202,7 @@ jobs:
202202
git reset --hard
203203
# pull specific commit with desired GDAL version
204204
git pull
205-
git checkout d24ce43972a16be005ba1458eed67d071d44dc1c
205+
git checkout 66c1c9852bb30bd87285e77cc775072046d51fc6
206206
207207
- name: Install GDAL
208208
env:
@@ -242,7 +242,7 @@ jobs:
242242
os:
243243
[
244244
"ubuntu-latest",
245-
"ubuntu-20.04",
245+
"ubuntu-22.04",
246246
"windows-latest",
247247
"macos-13",
248248
"macos-latest",
@@ -253,7 +253,7 @@ jobs:
253253
artifact: pyogrio-wheel-linux-manylinux2014_x86_64
254254
- os: "ubuntu-latest"
255255
artifact: pyogrio-wheel-linux-manylinux_2_28_x86_64
256-
- os: "ubuntu-20.04"
256+
- os: "ubuntu-22.04"
257257
artifact: pyogrio-wheel-linux-manylinux_2_28_x86_64
258258
- os: "windows-latest"
259259
artifact: pyogrio-wheel-x64-windows-dynamic-release

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
### Packaging
1717

18-
- The GDAL library included in the wheels is upgraded from 3.9.2 to 3.10.2 (#499).
18+
- The GDAL library included in the wheels is upgraded from 3.9.2 to 3.10.3 (#499).
1919

2020
## 0.10.0 (2024-09-28)
2121

ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN yum install -y curl unzip zip tar perl-IPC-Cmd
77
RUN ln -s /opt/python/cp38-cp38/bin/python3 /usr/bin/python3
88

99
RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \
10-
git -C /opt/vcpkg checkout cd1099f42a3c2ee28dc68e3db3f6f88658982736
10+
git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6
1111

1212
ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
1313
ENV PATH="${PATH}:/opt/vcpkg"

ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM quay.io/pypa/manylinux_2_28_aarch64:2025-01-11-3165879
44
RUN dnf -y install curl zip unzip tar ninja-build perl-IPC-Cmd
55

66
RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \
7-
git -C /opt/vcpkg checkout d24ce43972a16be005ba1458eed67d071d44dc1c
7+
git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6
88

99
ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
1010
ENV PATH="${PATH}:/opt/vcpkg"

ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM quay.io/pypa/manylinux_2_28_x86_64:2025-01-11-3165879
44
RUN dnf -y install curl zip unzip tar ninja-build perl-IPC-Cmd
55

66
RUN git clone https://github.com/Microsoft/vcpkg.git /opt/vcpkg && \
7-
git -C /opt/vcpkg checkout d24ce43972a16be005ba1458eed67d071d44dc1c
7+
git -C /opt/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6
88

99
ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
1010
ENV PATH="${PATH}:/opt/vcpkg"

ci/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"features": ["recommended-features", "curl", "geos", "iconv", "openssl"]
99
}
1010
],
11-
"builtin-baseline": "d24ce43972a16be005ba1458eed67d071d44dc1c"
11+
"builtin-baseline": "66c1c9852bb30bd87285e77cc775072046d51fc6"
1212
}

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ build-verbosity = 3
5151
VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/$VCPKG_DEFAULT_TRIPLET"
5252
GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
5353
GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
54-
GDAL_VERSION = "3.10.2"
54+
GDAL_VERSION = "3.10.3"
5555
PYOGRIO_PACKAGE_DATA = 1
5656
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
5757
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -66,7 +66,7 @@ repair-wheel-command = [
6666
VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/$VCPKG_DEFAULT_TRIPLET"
6767
GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
6868
GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
69-
GDAL_VERSION = "3.10.2"
69+
GDAL_VERSION = "3.10.3"
7070
PYOGRIO_PACKAGE_DATA = 1
7171
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
7272
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -80,7 +80,7 @@ repair-wheel-command = "delvewheel repair --add-path C:/vcpkg/installed/x64-wind
8080
VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-dynamic-release"
8181
GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
8282
GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
83-
GDAL_VERSION = "3.10.2"
83+
GDAL_VERSION = "3.10.3"
8484
PYOGRIO_PACKAGE_DATA = 1
8585
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
8686
PROJ_LIB = "$VCPKG_INSTALL/share/proj"

0 commit comments

Comments
 (0)