Merge remote-tracking branch 'upstream/master'

Author: abellgithub

.github/workflows/android_cmake.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |

.github/workflows/cifuzz.yml

@@ -32,7 +32,7 @@ jobs:
         fuzz-seconds: 600
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/cmake_builds.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Checkout GDAL
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Setup cache
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       id: cache
       with:
           path: ${{ github.workspace }}/.ccache
@@ -103,8 +103,7 @@ jobs:
         # Build libjxl
         # libjxl being still unstable, if the main branch fails to compile/test
         # you can replace JXL_TREEISH=main by JXL_TREEISH=sha1_of_known_working_commit
-        # FIXME: restore JXL_TREEISH=main, once https://github.com/libjxl/libjxl/issues/4410 is solved
-        JXL_TREEISH=a4e40af31ab4dd6d6b9ce893c4425b7180012916
+        JXL_TREEISH=main
         git clone https://github.com/libjxl/libjxl.git --recursive \
             && cd libjxl \
             && git checkout ${JXL_TREEISH} \
@@ -333,7 +332,7 @@ jobs:
             mingw-w64-x86_64-libgeotiff mingw-w64-x86_64-libpng mingw-w64-x86_64-libtiff mingw-w64-x86_64-openjpeg2
             mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-pytest mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-swig mingw-w64-x86_64-python-psutil mingw-w64-x86_64-blosc mingw-w64-x86_64-libavif
       - name: Setup cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: ${{ github.workspace }}\.ccache
@@ -377,19 +376,19 @@ jobs:
       - name: Build
         run: cmake --build build -j 3
         working-directory: ${{ github.workspace }}
-      - name: test
-        run: cmake --build build --target quicktest
-        working-directory: ${{ github.workspace }}
-      - name: test (with ctest)
-        run: |
-          ctest --test-dir $GITHUB_WORKSPACE/build -C Release -V -j 3
-        env:
-          BUILD_NAME: mingw64
-          SKIP_OGR_GMLAS_HUGE_PROCESSING_TIME: YES
-          SKIP_OGR_GMLAS_HTTP_RELATED: YES
-          SKIP_TIFF_JPEG12: YES
-          SKIP_VSIRAR: YES
-        working-directory: ${{ github.workspace }}
+      #- name: test
+      #  run: cmake --build build --target quicktest
+      #  working-directory: ${{ github.workspace }}
+      #- name: test (with ctest)
+      #  run: |
+      #    ctest --test-dir $GITHUB_WORKSPACE/build -C Release -V -j 3
+      #  env:
+      #    BUILD_NAME: mingw64
+      #    SKIP_OGR_GMLAS_HUGE_PROCESSING_TIME: YES
+      #    SKIP_OGR_GMLAS_HTTP_RELATED: YES
+      #    SKIP_TIFF_JPEG12: YES
+      #    SKIP_VSIRAR: YES
+      #  working-directory: ${{ github.workspace }}
       - name: Install
         run: cmake --build build --target install -j 3
         working-directory: ${{ github.workspace }}
@@ -479,8 +478,8 @@ jobs:
     - name: test (with ctest)
       shell: bash -l {0}
       run: |
-        # Exclude doc spellcheck as it crashes
-        ctest --test-dir $GITHUB_WORKSPACE/build -C Release -V -j 3 -E spelling
+        # Exclude doc spellcheck and example tests as they crash
+        ctest --test-dir $GITHUB_WORKSPACE/build -C Release -V -j 3 -E doc
       env:
         SKIP_OGR_GMLAS_HUGE_PROCESSING_TIME: YES
         SKIP_OGR_GMLAS_HTTP_RELATED: YES
@@ -540,16 +539,23 @@ jobs:
     - name: Install dependency
       shell: bash -l {0}
       run: |
-        conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake setuptools
+        conda install --yes --quiet proj python=3.12 swig pytest pytest-env pytest-benchmark filelock lxml cmake setuptools
     - name: Check CMake version
       shell: bash -l {0}
       run: |
         cmake --version
+
+    - name: Remove conflicting libraries
+      shell: bash -l {0}
+      run: |
+          rm -rf C:/Strawberry || /bin/true
+          rm -rf "C:/Program Files/OpenSSL/lib" || /bin/true
+
     - name: Configure
       shell: bash -l {0}
       run: |
         mkdir -p $GITHUB_WORKSPACE/build
-        cmake -A ${architecture} -G "${generator}" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -Werror=dev "-DCMAKE_CXX_COMPILER_LAUNCHER=clcache" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DGDAL_USE_EXTERNAL_LIBS:BOOL=OFF -DWERROR_DEV_FLAG="-Werror=dev"
+        cmake -A ${architecture} -G "${generator}" "-DCMAKE_PREFIX_PATH=${CONDA}/envs/gdalenv" -Werror=dev "-DCMAKE_CXX_COMPILER_LAUNCHER=clcache" -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD} -S "$GITHUB_WORKSPACE" -B "$GITHUB_WORKSPACE/build" -DCMAKE_C_FLAGS=" /WX" -DCMAKE_CXX_FLAGS=" /WX" -DGDAL_USE_EXTERNAL_LIBS:BOOL=OFF -DWERROR_DEV_FLAG="-Werror=dev" -DCMAKE_CXX_STANDARD=20
     - name: Build
       shell: bash -l {0}
       run: cmake --build $GITHUB_WORKSPACE/build --config RelWithDebInfo -j 2
@@ -615,7 +621,7 @@ jobs:
     - name: Checkout GDAL
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Setup cache
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       id: cache
       with:
           path: ${{ github.workspace }}/.ccache
@@ -704,7 +710,7 @@ jobs:
     - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
       with:
         activate-environment: gdalenv
-        python-version: 3.9
+        python-version: "3.10"
         channels: conda-forge
     - name: Install dependency
       shell: bash -l {0}

.github/workflows/code_checks.yml

@@ -167,7 +167,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
   other_checks:
@@ -196,9 +196,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: Install lint tool
       run: |
         PYTHON_CMD=python3 && $PYTHON_CMD -m pip --upgrade pip
@@ -229,9 +229,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: Check cmakelist
       run: |
         python scripts/collect_config_options.py
@@ -244,9 +244,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: Check cmakelist
       run: |
         python scripts/collect_driver_connection_prefix.py

.github/workflows/codeql.yml

@@ -102,13 +102,14 @@ jobs:
             -DCMAKE_BUILD_TYPE=Debug \
             -DGDAL_USE_LERC_INTERNAL=OFF \
             -DBUILD_TESTING=OFF \
+            -DCMAKE_CXX_FLAGS="-DDEBUG_VERBOSE -Werror" \
             -G Ninja \
 
     # Initializes the CodeQL tools for scanning.
     # We do that after running CMake to avoid CodeQL to trigger during CMake time,
     # in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -128,6 +129,6 @@ jobs:
         cmake --build build -j$(nproc)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/conda.yml

@@ -29,9 +29,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # macos-13: Intel
+        # macos-15-intel: Intel
         # macos-14: arm64
-        platform: ['ubuntu-latest','windows-latest','macos-13','macos-14']
+        platform: ['ubuntu-latest','windows-latest','macos-15-intel','macos-14','ubuntu-24.04-arm']
 
     env:
       GHA_CI_PLATFORM: ${{ matrix.platform }}
@@ -45,7 +45,7 @@ jobs:
       if: matrix.platform == 'windows-latest'
 
     - name: Cache Conda Environment
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ~/conda_pkgs_dir
         key: ${{ runner.os }}-${{ steps.get-date.outputs.today }}-conda-${{ env.CACHE_NUMBER }}
@@ -74,7 +74,7 @@ jobs:
           source ../ci/travis/conda/compile.sh
       working-directory: ./gdal-feedstock
 
-    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+    - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       with:
         name: ${{ matrix.platform }}-conda-package
         path: ./gdal-feedstock/packages/

.github/workflows/doc_checks.yml

@@ -36,6 +36,8 @@ jobs:
           . doc_env/bin/activate
           python3 -m pip install -r doc/requirements.txt
           python3 -m pip install setuptools
+          python3 -m pip install pytest
+          python3 -m pip install docstub
           echo PATH=$PATH >> $GITHUB_ENV
 
     - name: Build GDAL
@@ -73,18 +75,32 @@ jobs:
         if find . -name '*.rst' | xargs grep "\.\.warning"; then echo 'Wrong annotation. Should be .. warning'; false; fi
         if find . -name '*.rst' | xargs grep "\.\.codeblock"; then echo 'Wrong annotation. Should be .. codeblock'; false; fi
       working-directory: ./doc
+
     - name: Doxygen
       shell: bash -l {0}
       run: |
         cmake --build . --target doxygen_xml
       working-directory: build
+
+    - name: Test documentation examples
+      shell: bash -l {0}
+      run: |
+          ctest -V -R doc-examples --output-on-failure
+      working-directory: build
+
     - name: Spelling
       shell: bash -l {0}
       run: |
         python3 -c 'from osgeo import gdal'
         ctest -V -R spelling --output-on-failure
       working-directory: build
 
+    - name: Docstub annotations
+      shell: bash -l {0}
+      run: |
+        ctest -V -R docstub-annotations --output-on-failure
+      working-directory: build
+
     # ReadTheDocs pull requests do not build PDF, but we can break it though,
     # so build it here
     - name: PDF build
@@ -96,7 +112,7 @@ jobs:
       working-directory: build
 
     - name: Upload PDF
-      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
       with:
         name: gdal.pdf
         path: build/doc/build/latex/gdal.pdf