From a14f75cadf080e6ed008f7d79ea8efa43935f4b0 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sat, 3 Jan 2026 19:19:02 +0100 Subject: [PATCH 01/16] Add more datascience packages --- vcpkg/vcpkg.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 667b058e251e..40a6472f56d2 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -8,7 +8,7 @@ "registries": [ { "kind": "git", - "baseline": "1c3ef0209e78dceceeca3c4d18f93540a19c37bc", + "baseline": "3c72dc8024704288fa43cb5fbcdf60e6e554c340", "repository": "https://github.com/open-vcpkg/python-registry", "packages": [ "python3", @@ -118,11 +118,21 @@ "python" ] }, + "py-adbc-postgresql", + "py-adbc-sqlite", "py-attrs", "py-autopep8", "py-beautifulsoup4", "py-dateutil", "py-duckdb", + { + "name": "py-geopandas", + "features": [ + "fiona", + "arrow" + ] + }, + "py-scipy", "py-isort", "py-jinja2", { From 6271fc39ed5c397a1ad3306cb00ed53b6a111cc6 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 4 Jan 2026 09:21:15 +0100 Subject: [PATCH 02/16] Remove 'arrow' feature from py-geopandas --- vcpkg/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 40a6472f56d2..bd7b5eb84071 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -128,8 +128,7 @@ { "name": "py-geopandas", "features": [ - "fiona", - "arrow" + "fiona" ] }, "py-scipy", From f0c9d9fac763271cc4f23b8b5691f4b26293e19d Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 4 Jan 2026 10:21:33 +0100 Subject: [PATCH 03/16] Update vcpkg baseline and add arrow feature --- vcpkg/vcpkg.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index bd7b5eb84071..1690c3b06fe8 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -8,7 +8,7 @@ "registries": [ { "kind": "git", - "baseline": "3c72dc8024704288fa43cb5fbcdf60e6e554c340", + "baseline": "35ef49576c77579c0d764a71f490373e44f2520a", "repository": "https://github.com/open-vcpkg/python-registry", "packages": [ "python3", @@ -128,7 +128,8 @@ { "name": "py-geopandas", "features": [ - "fiona" + "fiona", + "arrow" ] }, "py-scipy", From b554c0a813e761a8d670bd48ef8adf4affb02a15 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sat, 10 Jan 2026 07:02:21 +0100 Subject: [PATCH 04/16] Add gfortran symlink steps for macOS builds --- .github/workflows/build-macos-qt6.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build-macos-qt6.yml b/.github/workflows/build-macos-qt6.yml index e93c067e6d04..35c9fd142369 100644 --- a/.github/workflows/build-macos-qt6.yml +++ b/.github/workflows/build-macos-qt6.yml @@ -56,6 +56,28 @@ jobs: echo $(brew --prefix flex)/bin >> $GITHUB_PATH echo $(brew --prefix libtool)/bin >> $GITHUB_PATH + - name: Symlink gfortran (macOS) + if: matrix.os == 'macos-15' + run: | + # make sure gfortran is available + # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md + # https://github.com/actions/runner-images/issues/3371 + # ln version - new path 'MacOS14' + sudo ln -fs /opt/homebrew/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran + sudo mkdir -p /usr/local/gfortran + sudo ln -sf /opt/homebrew/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib + + - name: Symlink gfortran (macOS-intel) + if: matrix.os == 'macos-15-intel' + run: | + # make sure gfortran is available + # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md + # https://github.com/actions/runner-images/issues/3371 + # ln version - new path 'MacOS14' + sudo ln -fs /usr/local/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran + sudo mkdir -p /usr/local/gfortran + sudo ln -sf /usr/local/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib + - uses: actions/setup-python@v6 with: python-version: '3.11' From 499e6aa42a3637b3b57c6343bfa185b6723292e7 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sat, 10 Jan 2026 07:31:05 +0100 Subject: [PATCH 05/16] Update macOS version in build workflow for gfortran --- .github/workflows/build-macos-qt6.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-macos-qt6.yml b/.github/workflows/build-macos-qt6.yml index 35c9fd142369..a0d1afea63ca 100644 --- a/.github/workflows/build-macos-qt6.yml +++ b/.github/workflows/build-macos-qt6.yml @@ -57,10 +57,10 @@ jobs: echo $(brew --prefix libtool)/bin >> $GITHUB_PATH - name: Symlink gfortran (macOS) - if: matrix.os == 'macos-15' + if: matrix.os == 'macos-14' run: | # make sure gfortran is available - # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md + # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md # https://github.com/actions/runner-images/issues/3371 # ln version - new path 'MacOS14' sudo ln -fs /opt/homebrew/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran @@ -68,10 +68,10 @@ jobs: sudo ln -sf /opt/homebrew/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib - name: Symlink gfortran (macOS-intel) - if: matrix.os == 'macos-15-intel' + if: matrix.os == 'macos-14-intel' run: | # make sure gfortran is available - # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md + # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md # https://github.com/actions/runner-images/issues/3371 # ln version - new path 'MacOS14' sudo ln -fs /usr/local/bin/gfortran-${GCC_VERSION} /usr/local/bin/gfortran From 0ff8b0b01e54dfb2144831d2e07a06d296bb82ee Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 11 Jan 2026 09:09:58 +0100 Subject: [PATCH 06/16] Update vcpkg baseline version --- vcpkg/vcpkg.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 1690c3b06fe8..ffca89f2e5eb 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -2,7 +2,7 @@ "vcpkg-configuration": { "default-registry": { "kind": "git", - "baseline": "5d57f5a0a5469a23e005fc79a7c1814ab4fc967e", + "baseline": "bf4d0b470612b845487623b85af9c04c96acf36a", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [ @@ -33,6 +33,7 @@ "description": "QGIS is a free, open source, cross platform (lin/win/mac) geographical information system (GIS)", "homepage": "https://qgis.org", "dependencies": [ + "expat", { "name": "gdal", @@ -112,6 +113,12 @@ "bindings": { "description": "Determines whether Python bindings should be built", "dependencies": [ + { + "name": "arrow", + "features": [ + "python" + ] + }, { "name": "gdal", "features": [ From f8af463446474f6f3cac50c59ac2a05a45c90722 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 11 Jan 2026 09:13:32 +0100 Subject: [PATCH 07/16] Update baseline versions in vcpkg.json --- vcpkg/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index ffca89f2e5eb..4b61d6dffa64 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -2,13 +2,13 @@ "vcpkg-configuration": { "default-registry": { "kind": "git", - "baseline": "bf4d0b470612b845487623b85af9c04c96acf36a", + "baseline": "5d57f5a0a5469a23e005fc79a7c1814ab4fc967e", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [ { "kind": "git", - "baseline": "35ef49576c77579c0d764a71f490373e44f2520a", + "baseline": "bf4d0b470612b845487623b85af9c04c96acf36a", "repository": "https://github.com/open-vcpkg/python-registry", "packages": [ "python3", From f27ff3116e8e6ddccf2fd38fa61538532f5159c3 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 11 Jan 2026 19:40:14 +0100 Subject: [PATCH 08/16] Update vcpkg baseline version in vcpkg.json --- vcpkg/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 4b61d6dffa64..393b9ba126a3 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -8,7 +8,7 @@ "registries": [ { "kind": "git", - "baseline": "bf4d0b470612b845487623b85af9c04c96acf36a", + "baseline": "c8ff38b5c7e84ed2380f14cffb137bf76f9d6418", "repository": "https://github.com/open-vcpkg/python-registry", "packages": [ "python3", From 52540053a5ce66073a78000218c5e27682a8b7c4 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 11 Jan 2026 19:42:50 +0100 Subject: [PATCH 09/16] Add 'arrow' package to vcpkg.json --- vcpkg/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 393b9ba126a3..a5306b00ccde 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -11,6 +11,7 @@ "baseline": "c8ff38b5c7e84ed2380f14cffb137bf76f9d6418", "repository": "https://github.com/open-vcpkg/python-registry", "packages": [ + "arrow", "python3", "py-*", "gdal", From 26ccce226e57af8dff5b6f1d32068b137badcbc7 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 11 Jan 2026 20:56:39 +0100 Subject: [PATCH 10/16] Update macOS version in build workflow --- .github/workflows/build-macos-qt6.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-macos-qt6.yml b/.github/workflows/build-macos-qt6.yml index a0d1afea63ca..70d5f11bbfd8 100644 --- a/.github/workflows/build-macos-qt6.yml +++ b/.github/workflows/build-macos-qt6.yml @@ -19,11 +19,11 @@ jobs: strategy: matrix: include: - - os: macos-14 + - os: macos-15 triplet: x64-osx-dynamic-release deployment-target: "10.15" osx-architecture: "x86_64" - - os: macos-14 + - os: macos-15 triplet: arm64-osx-dynamic-release deployment-target: "11.0" osx-architecture: "arm64" @@ -57,7 +57,7 @@ jobs: echo $(brew --prefix libtool)/bin >> $GITHUB_PATH - name: Symlink gfortran (macOS) - if: matrix.os == 'macos-14' + if: matrix.os == 'macos-15' run: | # make sure gfortran is available # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md @@ -68,7 +68,7 @@ jobs: sudo ln -sf /opt/homebrew/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib - name: Symlink gfortran (macOS-intel) - if: matrix.os == 'macos-14-intel' + if: matrix.os == 'macos-15-intel' run: | # make sure gfortran is available # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md From 8ecd5c779d4c37c7a0cda8ce5298055b6e19a195 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 14 Jan 2026 07:05:19 +0100 Subject: [PATCH 11/16] Add environment variables for Fortran and GCC --- .github/workflows/build-macos-qt6.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-macos-qt6.yml b/.github/workflows/build-macos-qt6.yml index 70d5f11bbfd8..9b88bb1c5971 100644 --- a/.github/workflows/build-macos-qt6.yml +++ b/.github/workflows/build-macos-qt6.yml @@ -29,6 +29,9 @@ jobs: osx-architecture: "arm64" name: build (macos) runs-on: ${{ matrix.os }} + env: + FC: gfortran + GCC_VERSION: 15 steps: - name: 🐣 Checkout From ad6a86d6d9ded60db23fac26e554c5b5f1ca5f2d Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 16 Jan 2026 06:43:01 +0100 Subject: [PATCH 12/16] Remove 'py-scipy' from dependencies --- vcpkg/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index a5306b00ccde..400cff7f6d7f 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -140,7 +140,6 @@ "arrow" ] }, - "py-scipy", "py-isort", "py-jinja2", { From bc2021ef2487b6ab90d4bc6896bb7c283c3681d5 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 16 Jan 2026 20:37:57 +0100 Subject: [PATCH 13/16] Update macOS version in CI workflow --- .github/workflows/build-macos-qt6.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-macos-qt6.yml b/.github/workflows/build-macos-qt6.yml index 9b88bb1c5971..e4435d62f74c 100644 --- a/.github/workflows/build-macos-qt6.yml +++ b/.github/workflows/build-macos-qt6.yml @@ -19,11 +19,11 @@ jobs: strategy: matrix: include: - - os: macos-15 + - os: macos-14 triplet: x64-osx-dynamic-release deployment-target: "10.15" osx-architecture: "x86_64" - - os: macos-15 + - os: macos-14 triplet: arm64-osx-dynamic-release deployment-target: "11.0" osx-architecture: "arm64" @@ -60,7 +60,7 @@ jobs: echo $(brew --prefix libtool)/bin >> $GITHUB_PATH - name: Symlink gfortran (macOS) - if: matrix.os == 'macos-15' + if: matrix.os == 'macos-14' run: | # make sure gfortran is available # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md @@ -71,7 +71,7 @@ jobs: sudo ln -sf /opt/homebrew/Cellar/gcc@${GCC_VERSION}/*/lib/gcc/${GCC_VERSION} /usr/local/gfortran/lib - name: Symlink gfortran (macOS-intel) - if: matrix.os == 'macos-15-intel' + if: matrix.os == 'macos-14-intel' run: | # make sure gfortran is available # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md From 4166b710f069bac7f452821db94175c77f135a10 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 16 Jan 2026 20:44:46 +0100 Subject: [PATCH 14/16] Fix formatting and structure in vcpkg.json --- vcpkg/vcpkg.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 400cff7f6d7f..a20cf615095e 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -34,7 +34,6 @@ "description": "QGIS is a free, open source, cross platform (lin/win/mac) geographical information system (GIS)", "homepage": "https://qgis.org", "dependencies": [ - "expat", { "name": "gdal", @@ -118,7 +117,12 @@ "name": "arrow", "features": [ "python" - ] + ], + "platform": "!windows" + }, + { + "name": "arrow", + "platform": "windows" }, { "name": "gdal", From 184f819d022df73fecfe701edc2f8aa9829ee6bf Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 16 Jan 2026 21:25:05 +0100 Subject: [PATCH 15/16] no geopandas on windows --- vcpkg/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index a20cf615095e..44dafede6df9 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -142,7 +142,8 @@ "features": [ "fiona", "arrow" - ] + ], + "platform": "!windows" }, "py-isort", "py-jinja2", From 370c5da0a755c004829379e89d3e2ec907eafae9 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sat, 17 Jan 2026 08:09:35 +0100 Subject: [PATCH 16/16] No windows for py-adbc packages --- vcpkg/vcpkg.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json index 44dafede6df9..25f04fcb0e10 100644 --- a/vcpkg/vcpkg.json +++ b/vcpkg/vcpkg.json @@ -130,8 +130,14 @@ "python" ] }, - "py-adbc-postgresql", - "py-adbc-sqlite", + { + "name": "py-adbc-postgresql", + "platform": "!windows" + }, + { + "name": "py-adbc-sqlite", + "platform": "!windows" + }, "py-attrs", "py-autopep8", "py-beautifulsoup4",