Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ci/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"features": ["recommended-features", "curl", "geos", "iconv", "openssl"]
}
],
"builtin-baseline": "0857a4b08c14030bbe41e80accb2b1fddb047a74"
"builtin-baseline": "d24ce43972a16be005ba1458eed67d071d44dc1c"
}
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down