Skip to content

Commit 691fe85

Browse files
BLD/RLS: update wheels to include GDAL 3.6.3 (#238)
1 parent 8889f2a commit 691fe85

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
path: |
156156
${{ matrix.vcpkg_cache }}
157157
# bump the last digit to avoid using previous build cache
158-
key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.6.2-cache0
158+
key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.6.3-cache0
159159

160160
# MacOS build requires aclocal, which is part of automake, but appears
161161
# to be missing in default image
@@ -173,7 +173,7 @@ jobs:
173173
git reset --hard
174174
# pull latest version to ensure the required commit with GDAL 3.6 is available
175175
git pull
176-
git checkout 94e85d15fb857f8d4150006fe3b61aca839ac299
176+
git checkout fe2d921cd5e1c8721e8e2385c35fb3a4ea65e559
177177
178178
- name: Install GDAL
179179
env:

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
- Failure error messages from GDAL are no longer printed to stderr (they were
1616
already translated into Python exceptions as well) (#236).
1717

18+
### Packaging
19+
20+
- The GDAL library included in the wheels is updated from 3.6.2 to GDAL 3.6.3.
21+
1822
## 0.5.1 (2023-01-26)
1923

2024
### Bug fixes

ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/pypa/manylinux2014_x86_64:2023-01-03-129be5e
1+
FROM quay.io/pypa/manylinux2014_x86_64:2023-04-02-7bc2fc8
22

33
# building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988)
44
RUN yum install -y curl unzip zip tar perl-IPC-Cmd

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"]
99
}
1010
],
11-
"builtin-baseline": "94e85d15fb857f8d4150006fe3b61aca839ac299"
11+
"builtin-baseline": "fe2d921cd5e1c8721e8e2385c35fb3a4ea65e559"
1212
}

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ build-verbosity = 3
2020
VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/x64-linux-dynamic"
2121
GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
2222
GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
23-
GDAL_VERSION = "3.6.2"
23+
GDAL_VERSION = "3.6.3"
2424
PYOGRIO_PACKAGE_DATA = 1
2525
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
2626
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -35,7 +35,7 @@ repair-wheel-command = [
3535
VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/$VCPKG_DEFAULT_TRIPLET"
3636
GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
3737
GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
38-
GDAL_VERSION = "3.6.2"
38+
GDAL_VERSION = "3.6.3"
3939
PYOGRIO_PACKAGE_DATA = 1
4040
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
4141
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
@@ -48,7 +48,7 @@ repair-wheel-command = "delvewheel repair --add-path C:/vcpkg/installed/x64-wind
4848
VCPKG_INSTALL = "$VCPKG_INSTALLATION_ROOT/installed/x64-windows-dynamic-release"
4949
GDAL_INCLUDE_PATH = "$VCPKG_INSTALL/include"
5050
GDAL_LIBRARY_PATH = "$VCPKG_INSTALL/lib"
51-
GDAL_VERSION = "3.6.2"
51+
GDAL_VERSION = "3.6.3"
5252
PYOGRIO_PACKAGE_DATA = 1
5353
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
5454
PROJ_LIB = "$VCPKG_INSTALL/share/proj"

0 commit comments

Comments
 (0)