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.

Sign up for GitHub

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.6.3 #238

Merged
merged 3 commits into from
Apr 4, 2023
Merged

BLD/RLS: update wheels to include GDAL 3.6.3 #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93a4211
BLD/RLS: update wheels to include GDAL 3.6.3
jorisvandenbossche Apr 3, 2023
dbf0c57
add changelog note
jorisvandenbossche Apr 4, 2023
51d09ad
Merge remote-tracking branch 'upstream/main' into ci-wheel-gdal-363
jorisvandenbossche Apr 4, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2-cache0
key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.6.3-cache0

# MacOS build requires aclocal, which is part of automake, but appears
# to be missing in default image
Expand All @@ -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 94e85d15fb857f8d4150006fe3b61aca839ac299
git checkout fe2d921cd5e1c8721e8e2385c35fb3a4ea65e559

- name: Install GDAL
env:
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
- Standardized 3-dimensional geometry type labels from "2.5D <type>" to
"<type> Z" for consistency with well-known text (WKT) formats (#234)

### Packaging

- The GDAL library included in the wheels is updated from 3.6.2 to GDAL 3.6.3.

## 0.5.1 (2023-01-26)

### Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/pypa/manylinux2014_x86_64:2023-01-03-129be5e
FROM quay.io/pypa/manylinux2014_x86_64:2023-04-02-7bc2fc8

# building openssl needs IPC-Cmd (https://github.com/microsoft/vcpkg/issues/24988)
RUN yum install -y curl unzip zip tar perl-IPC-Cmd
Expand Down
2 changes: 1 addition & 1 deletion ci/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"features": ["recommended-features", "curl", "geos"]
}
],
"builtin-baseline": "94e85d15fb857f8d4150006fe3b61aca839ac299"
"builtin-baseline": "fe2d921cd5e1c8721e8e2385c35fb3a4ea65e559"
}
6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2"
GDAL_VERSION = "3.6.3"
PYOGRIO_PACKAGE_DATA = 1
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
Expand All @@ -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.2"
GDAL_VERSION = "3.6.3"
PYOGRIO_PACKAGE_DATA = 1
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
Expand All @@ -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.2"
GDAL_VERSION = "3.6.3"
PYOGRIO_PACKAGE_DATA = 1
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
Expand Down