diff --git a/.github/workflows/builder_releaser.yml b/.github/workflows/builder_releaser.yml index 385b134c..e7fde823 100644 --- a/.github/workflows/builder_releaser.yml +++ b/.github/workflows/builder_releaser.yml @@ -22,7 +22,8 @@ on: # Globals env: PROJECT_FOLDER: "dicogis" - PYTHON_VERSION: "3.11" + # Python embedded in the executables, Linux and Windows alike + PYTHON_VERSION: "3.14" PYINSTALLER_LOG_LEVEL: "DEBUG" USE_PATH_FOR_GDAL_PYTHON: yes @@ -133,8 +134,12 @@ jobs: env: export_output_folder: tests/ci/windows - GDAL_VERSION: "3.11.1" - PYTHON_VERSION: "3.11" + # geospatial-wheels release providing a GDAL wheel for PYTHON_VERSION: + # v2025.10.25 is the first one built after Python 3.14.0 final (earlier + # cp314 wheels target 3.14 pre-releases, before its ABI was frozen). + # Keep aligned with the Windows job of tester.yml. + GDAL_VERSION: "3.11.4" + GEOSPATIAL_WHEELS_RELEASE: "v2025.10.25" steps: - name: Get source code @@ -150,9 +155,11 @@ jobs: cache-dependency-path: pyproject.toml - name: Install project requirements + shell: pwsh run: | python -m pip install -U pip setuptools wheel - python -m pip install -U https://github.com/cgohlke/geospatial-wheels/releases/download/v2025.7.4/gdal-3.11.1-cp311-cp311-win_amd64.whl + $cpTag = "cp" + ($env:PYTHON_VERSION -replace '\.', '') + python -m pip install -U "https://github.com/cgohlke/geospatial-wheels/releases/download/${env:GEOSPATIAL_WHEELS_RELEASE}/gdal-${env:GDAL_VERSION}-$cpTag-$cpTag-win_amd64.whl" - name: Install project as a package run: python -m pip install .[gdal,gui,packaging] diff --git a/.github/workflows/tester.yml b/.github/workflows/tester.yml index 988172ff..f274e88f 100644 --- a/.github/workflows/tester.yml +++ b/.github/workflows/tester.yml @@ -144,10 +144,14 @@ jobs: - "3.11" - "3.12" - "3.13" + - "3.14" env: export_output_folder: tests/ci/windows - GDAL_VERSION: "3.11.1" + # keep aligned with the Windows job of builder_releaser.yml, which ships + # this GDAL in the executables + GDAL_VERSION: "3.11.4" + GEOSPATIAL_WHEELS_RELEASE: "v2025.10.25" permissions: contents: read @@ -170,7 +174,7 @@ jobs: run: | python -m pip install -U pip setuptools wheel $cpTag = "cp" + ($env:PYTHON_VERSION -replace '\.', '') - $wheelUrl = "https://github.com/cgohlke/geospatial-wheels/releases/download/v2025.7.4/gdal-${env:GDAL_VERSION}-$cpTag-$cpTag-win_amd64.whl" + $wheelUrl = "https://github.com/cgohlke/geospatial-wheels/releases/download/${env:GEOSPATIAL_WHEELS_RELEASE}/gdal-${env:GDAL_VERSION}-$cpTag-$cpTag-win_amd64.whl" python -m pip install -U $wheelUrl - name: Install project as a package diff --git a/docs/development/windows.md b/docs/development/windows.md index 8c6ce609..d56109d1 100644 --- a/docs/development/windows.md +++ b/docs/development/windows.md @@ -30,7 +30,7 @@ Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser > letting pip pull one from the package index used in "Install project" below. 1. Go to or to -1. Download the appropriate package for the Python environment (version, type...). For example: `gdal-3.11.1-cp311-cp311-win_amd64` +1. Download the appropriate package for the Python environment (version, type...). For example: `gdal-3.11.4-cp311-cp311-win_amd64` 1. Move downloaded wheel to the `lib` subfolder 1. Make sure there is only one wheel of GDAL in the `lib` subfolder