Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
cf40944
BUILD: quick check if LibKML and LibSpatialite can be included now
theroggy Jul 5, 2025
209b07f
Remove libpatialite
theroggy Jul 5, 2025
c0493dd
Reenable libspatialite + upload freexl logs
theroggy Jul 5, 2025
c5785ef
Update release.yml
theroggy Jul 5, 2025
e8710d9
Update release.yml
theroggy Jul 5, 2025
fd45a4b
Update release.yml
theroggy Jul 5, 2025
b3b7cc8
Update release.yml
theroggy Jul 5, 2025
c737f16
Update release.yml
theroggy Jul 5, 2025
5a8241e
Update release.yml
theroggy Jul 5, 2025
e4b40b5
Update release.yml
theroggy Jul 5, 2025
2810747
Update release.yml
theroggy Jul 5, 2025
51467c4
Update release.yml
theroggy Jul 5, 2025
5d0207c
Update release.yml
theroggy Jul 5, 2025
eda2b85
Update release.yml
theroggy Jul 5, 2025
c089e17
Try changing vcpkg work dir
theroggy Jul 5, 2025
6256bc3
Try to exclude freexl from the libspatialite dependencies
theroggy Jul 5, 2025
f7ba77f
Update vcpkg.json
theroggy Jul 5, 2025
0e8f7cb
Update vcpkg.json
theroggy Jul 5, 2025
b178acd
Update vcpkg.json
theroggy Jul 5, 2025
a606a62
Update vcpkg.json
theroggy Jul 5, 2025
28537dd
Add rttopo feature to spatialite
theroggy Jul 6, 2025
39e962d
Move the vcpkg also to usr for the other containers
theroggy Jul 6, 2025
ef76dd6
Try to docker copy log files first
theroggy Jul 6, 2025
6503bec
Update release.yml
theroggy Jul 6, 2025
521d4b6
Update release.yml
theroggy Jul 7, 2025
0c6d151
Update release.yml
theroggy Jul 16, 2025
e6be838
Update release.yml
theroggy Jul 16, 2025
db8b8af
BUILD: add libkml to builds for recent platforms
theroggy Aug 10, 2025
7ca8da6
Update manylinux2014_x86_64-vcpkg-gdal.Dockerfile
theroggy Aug 10, 2025
5bff952
Add test that is skipped if LibKML is not available
theroggy Aug 10, 2025
161fb18
Update CHANGES.md
theroggy Aug 10, 2025
c25b00c
Remove skip on libkml present as all tests seem to have libkml
theroggy Aug 10, 2025
f6b82ad
Add skip again as the ubuntu-small images don't have libkml
theroggy Aug 10, 2025
cea8169
Add test reading a kml simpledata element
theroggy Aug 10, 2025
e740a4d
Update test_geopandas_io.py
theroggy Aug 10, 2025
37c8c0b
Add skip if libkml is not available
theroggy Aug 10, 2025
d074d1a
Test arrow as well
theroggy Aug 10, 2025
3d05802
Move kml test file to conftest.py
theroggy Aug 10, 2025
84c6fb2
Update release.yml
theroggy Aug 28, 2025
714c5bf
Merge remote-tracking branch 'upstream/main' into BUILD-quick-check-i…
theroggy Aug 28, 2025
f4429e2
Apply suggestions
theroggy Aug 29, 2025
f2ceea5
Merge remote-tracking branch 'upstream/main' into BUILD-add-libkml-to…
theroggy Aug 29, 2025
76a57c9
Clarify that the z-dimension is being added by the LIBKML driver
theroggy Aug 29, 2025
fb08177
Merge remote-tracking branch 'upstream/main' into BUILD-add-libkml-to…
theroggy Aug 29, 2025
a9145ff
Use intmax_t for signed long long
theroggy Aug 29, 2025
03c1b1a
Use GIntBig instead of intmax_t
theroggy Aug 29, 2025
708cb99
Merge remote-tracking branch 'upstream/main' into BUILD-add-libkml-to…
theroggy Aug 29, 2025
88eb414
Merge remote-tracking branch 'upstream/main' into BUILD-quick-check-i…
theroggy Aug 29, 2025
f5dbfed
Merge branch 'BUILD-add-libkml-to-builds-for-recent-platforms' into B…
theroggy Aug 29, 2025
2bcb693
Merge remote-tracking branch 'upstream/main' into BUILD-quick-check-i…
theroggy Aug 29, 2025
d8eca7c
Try switching gdal to 3.11.3
theroggy Aug 29, 2025
12f6de2
pyogrio 0.12.0
theroggy Aug 29, 2025
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
20 changes: 17 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.3"
image: "ghcr.io/osgeo/gdal:ubuntu-small-3.11.3"

steps:
- name: Install packages
Expand Down Expand Up @@ -106,17 +106,20 @@ jobs:
container: "ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile"
os: ubuntu-latest
arch: x86_64
vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log"

# use manylinux_2_28 for any platforms with glibc>=2.28
- wheel_name: "pyogrio-wheel-linux-manylinux_2_28_x86_64"
container: "ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile"
os: ubuntu-latest
arch: x86_64
vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log"

- wheel_name: "pyogrio-wheel-linux-manylinux_2_28_aarch64"
container: "ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile"
os: ubuntu-24.04-arm
arch: aarch64
vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log"

steps:
- name: Checkout
Expand All @@ -137,14 +140,25 @@ jobs:
with:
context: .
file: ${{ matrix.container }}
tags: manylinux-${{ matrix.arch }}-vcpkg-gdal:latest
tags: manylinux-${{ matrix.arch }}-vcpkg-gdal-latest
push: false
load: true
cache-from: type=gha
cache-to: type=gha,mode=max
env:
BUILDKIT_PROGRESS: plain

- name: Display structure of downloaded files
run: ls -R

- name: Upload vcpkg build logs
if: ${{ failure() }}
uses: actions/upload-artifact@v4
with:
name: pyogrio-vcpkg-logs-${{ matrix.wheel_name }}
path: ~/*.log
retention-days: 10

- name: Build wheels
uses: pypa/[email protected]

Expand Down Expand Up @@ -193,7 +207,7 @@ jobs:
path: |
${{ matrix.vcpkg_cache }}
# bump the last digit to avoid using previous build cache
key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.10.3-cache0
key: ${{ matrix.os }}-${{ matrix.arch }}-vcpkg-gdal3.11.3-cache0

# MacOS build requires aclocal, which is part of automake, but appears
# to be missing in default image
Expand Down
24 changes: 12 additions & 12 deletions ci/manylinux2014_x86_64-vcpkg-gdal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ RUN yum install -y curl unzip zip tar perl-IPC-Cmd
# require python >= 3.7 (python 3.6 is default on base image) for meson
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 66c1c9852bb30bd87285e77cc775072046d51fc6
RUN git clone https://github.com/Microsoft/vcpkg.git /usr/local/share/vcpkg && \
git -C /usr/local/share/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6

ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
ENV PATH="${PATH}:/opt/vcpkg"
ENV VCPKG_INSTALLATION_ROOT="/usr/local/share/vcpkg"
ENV PATH="${PATH}:/usr/local/share/vcpkg"

ENV VCPKG_DEFAULT_TRIPLET="x64-linux-dynamic-release"

Expand All @@ -21,16 +21,16 @@ RUN bootstrap-vcpkg.sh && \
vcpkg integrate install && \
vcpkg integrate bash

COPY ci/custom-triplets/x64-linux-dynamic-release.cmake opt/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake
COPY ci/vcpkg-custom-ports/ opt/vcpkg/custom-ports/
COPY ci/vcpkg-manylinux2014.json opt/vcpkg/vcpkg.json
COPY ci/custom-triplets/x64-linux-dynamic-release.cmake /usr/local/share/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake
COPY ci/vcpkg-custom-ports/ /usr/local/share/vcpkg/custom-ports/
COPY ci/vcpkg-manylinux2014.json /usr/local/share/vcpkg/vcpkg.json

ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-dynamic-release/lib"
RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \
--overlay-ports=opt/vcpkg/custom-ports \
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/share/vcpkg/installed/x64-linux-dynamic-release/lib"
RUN vcpkg install --overlay-triplets=/usr/local/share/vcpkg/custom-triplets \
--overlay-ports=/usr/local/share/vcpkg/custom-ports \
--feature-flags="versions,manifests" \
--x-manifest-root=opt/vcpkg \
--x-install-root=opt/vcpkg/installed && \
--x-manifest-root=/usr/local/share/vcpkg \
--x-install-root=/usr/local/share/vcpkg/installed && \
vcpkg list

# setting git safe directory is required for properly building wheels when
Expand Down
20 changes: 10 additions & 10 deletions ci/manylinux_2_28_aarch64-vcpkg-gdal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ 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 66c1c9852bb30bd87285e77cc775072046d51fc6
RUN git clone https://github.com/Microsoft/vcpkg.git /usr/local/share/vcpkg && \
git -C /usr/local/share/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6

ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
ENV PATH="${PATH}:/opt/vcpkg"
ENV VCPKG_INSTALLATION_ROOT="/usr/local/share/vcpkg"
ENV PATH="${PATH}:/usr/local/share/vcpkg"

ENV VCPKG_DEFAULT_TRIPLET="arm64-linux-dynamic-release"
# pkgconf fails to build with default debug mode of arm64-linux host
Expand All @@ -23,14 +23,14 @@ RUN bootstrap-vcpkg.sh && \
vcpkg integrate install && \
vcpkg integrate bash

COPY ci/custom-triplets/arm64-linux-dynamic-release.cmake opt/vcpkg/custom-triplets/arm64-linux-dynamic-release.cmake
COPY ci/vcpkg.json opt/vcpkg/
COPY ci/custom-triplets/arm64-linux-dynamic-release.cmake /usr/local/share/vcpkg/custom-triplets/arm64-linux-dynamic-release.cmake
COPY ci/vcpkg.json /usr/local/share/vcpkg/

ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/arm64-linux-dynamic-release/lib"
RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/share/vcpkg/installed/arm64-linux-dynamic-release/lib"
RUN vcpkg install --overlay-triplets=/usr/local/share/vcpkg/custom-triplets \
--feature-flags="versions,manifests" \
--x-manifest-root=opt/vcpkg \
--x-install-root=opt/vcpkg/installed && \
--x-manifest-root=/usr/local/share/vcpkg/ \
--x-install-root=/usr/local/share/vcpkg/installed && \
vcpkg list

# setting git safe directory is required for properly building wheels when
Expand Down
20 changes: 10 additions & 10 deletions ci/manylinux_2_28_x86_64-vcpkg-gdal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ 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 66c1c9852bb30bd87285e77cc775072046d51fc6
RUN git clone https://github.com/Microsoft/vcpkg.git /usr/local/share/vcpkg && \
git -C /usr/local/share/vcpkg checkout 66c1c9852bb30bd87285e77cc775072046d51fc6

ENV VCPKG_INSTALLATION_ROOT="/opt/vcpkg"
ENV PATH="${PATH}:/opt/vcpkg"
ENV VCPKG_INSTALLATION_ROOT="/usr/local/share/vcpkg"
ENV PATH="${PATH}:/usr/local/share/vcpkg"

ENV VCPKG_DEFAULT_TRIPLET="x64-linux-dynamic-release"

Expand All @@ -18,14 +18,14 @@ RUN bootstrap-vcpkg.sh && \
vcpkg integrate install && \
vcpkg integrate bash

COPY ci/custom-triplets/x64-linux-dynamic-release.cmake opt/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake
COPY ci/vcpkg.json opt/vcpkg/
COPY ci/custom-triplets/x64-linux-dynamic-release.cmake /usr/local/share/vcpkg/custom-triplets/x64-linux-dynamic-release.cmake
COPY ci/vcpkg.json /usr/local/share/vcpkg/

ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/vcpkg/installed/x64-linux-dynamic-release/lib"
RUN vcpkg install --overlay-triplets=opt/vcpkg/custom-triplets \
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/share/vcpkg/installed/x64-linux-dynamic-release/lib"
RUN vcpkg install --overlay-triplets=/usr/local/share/vcpkg/custom-triplets \
--feature-flags="versions,manifests" \
--x-manifest-root=opt/vcpkg \
--x-install-root=opt/vcpkg/installed && \
--x-manifest-root=/usr/local/share/vcpkg \
--x-install-root=/usr/local/share/vcpkg/installed && \
vcpkg list

# setting git safe directory is required for properly building wheels when
Expand Down
9 changes: 8 additions & 1 deletion ci/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
{
"name": "pyogrio",
"version": "0.11.0",
"version": "0.12.0",
"dependencies": [
{
"name": "libspatialite",
"default-features": false,
"features": [
"rttopo"
]
},
{
"name": "gdal",
"default-features": false,
Expand Down
Loading