Merge remote-tracking branch 'upstream/master' into delete-error

Author: abellgithub

.github/workflows/alpine/Dockerfile.ci

@@ -52,14 +52,6 @@ RUN apk add \
     poppler-dev \
     proj-dev \
     proj-util \
-    py3-pyarrow \
-    py3-pyarrow-pyc \
-    py3-numpy \
-    py3-numpy-dev \
-    py3-numpy-tests \
-    py3-pip \
-    py3-setuptools \
-    python3-dev \
     qhull-dev \
     sfcgal-dev \
     snappy-dev \
@@ -69,9 +61,31 @@ RUN apk add \
     unixodbc-dev \
     xerces-c-dev \
     xz-dev \
+    wget \
     zlib-dev \
     zstd-dev
 
+#    py3-pyarrow \
+#    py3-pyarrow-pyc \
+#    py3-numpy \
+#    py3-numpy-dev \
+#    py3-numpy-tests \
+#    py3-pip \
+#    py3-setuptools \
+#    python3-dev \
+
+# Build a free-standing/no-gil Python
+RUN wget https://www.python.org/ftp/python/3.14.0/Python-3.14.0.tar.xz && \
+    tar xJvf Python-3.14.0.tar.xz && \
+    cd Python-3.14.0 && \
+    ./configure --enable-shared --disable-gil --prefix=/usr && \
+    make -j$(nproc) && \
+    make -j$(nproc) install && \
+    cd .. \
+    rm -rf Python-3.14.0 Python-3.14.0.tar.xz
+
+RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install --break-system-packages numpy setuptools pyarrow
+
 COPY requirements.txt /tmp/
 RUN PYTHON_CMD=python3 && $PYTHON_CMD -m pip install --break-system-packages -U -r /tmp/requirements.txt
 

.github/workflows/alpine/build.sh

@@ -46,6 +46,8 @@ apps/gdal --json-usage > out.json
 export PYTHON_CMD=python3
 $PYTHON_CMD -m venv myvenv
 source myvenv/bin/activate
+# Works around install issue with 0.18.17 with free-threading python: https://sourceforge.net/p/ruamel-yaml/tickets/554/
+$PYTHON_CMD -m pip install -U ruamel.yaml==0.18.16
 $PYTHON_CMD -m pip install -U check-jsonschema
 check-jsonschema --schemafile data/gdal_algorithm.schema.json out.json
 

.github/workflows/android_cmake.yml

@@ -26,10 +26,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         id: cache
         with:
           path: |

.github/workflows/android_cmake/start.sh

@@ -23,10 +23,10 @@ tar xzf cmake-3.22.3-linux-x86_64.tar.gz
 export PATH=$PWD/cmake-3.22.3-linux-x86_64/bin:$PATH
 
 # Download Android NDK
-wget -q https://dl.google.com/android/repository/android-ndk-r23b-linux.zip
-unzip -q android-ndk-r23b-linux.zip
+wget -q https://dl.google.com/android/repository/android-ndk-r27d-linux.zip
+unzip -q android-ndk-r27d-linux.zip
 
-export ANDROID_NDK=$PWD/android-ndk-r23b
+export ANDROID_NDK=$PWD/android-ndk-r27d
 export NDK_TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64
 
 ccache -M 1G

.github/workflows/armhf/test.sh

@@ -6,6 +6,13 @@ source ${GDAL_SOURCE_DIR:=..}/scripts/setdevenv.sh
 
 autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSpawn:test_cpl.CPLGetCurrentThreadCount
 
+# Random failures
+rm -f autotest/gcore/vsiaz.py
+rm -f autotest/gcore/vsigs.py
+rm -f autotest/gcore/vsis3.py
+rm -f autotest/gcore/vsizip.py
+rm -f autotest/gcore/vsioss.py
+
 pytest autotest/alg -k "not test_warp_52 and not test_warp_rpc_source_has_geotransform"
 # Excluded tests starting at test_tiff_read_multi_threaded are due to lack of virtual memory
 pytest autotest/gcore -k "not transformer and not virtualmem and not test_vrt_protocol_netcdf_component_name and not test_vsicrypt_3 and not test_pixfun_sqrt and not test_rasterio_rms_halfsize_downsampling_float and not test_tiff_read_multi_threaded and not test_tiff_write_35 and not test_tiff_write_137 and not test_tiff_write_compression_create_and_createcopy"

.github/workflows/auto_tag_stable.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Checkout code
         if: steps.check_branch.outputs.run == 'true'
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Tag
         if: steps.check_branch.outputs.run == 'true'

.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@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/clang_static_analyzer.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Run
         run: docker run --rm -v $PWD:$PWD ubuntu:24.04 sh -c "cd $PWD && apt update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends sudo software-properties-common && DEBIAN_FRONTEND=noninteractive sh ./ci/travis/csa_common/before_install.sh && sh ./ci/travis/csa_common/install.sh && sh ./ci/travis/csa_common/script.sh"

.github/workflows/cmake_builds.yml

@@ -36,9 +36,9 @@ jobs:
       cache-name: cmake-ubuntu-jammy
     steps:
     - name: Checkout GDAL
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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
@@ -317,9 +317,9 @@ jobs:
         run: |
           git config --global core.autocrlf false
       - name: Checkout GDAL
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Install development packages
-        uses: msys2/setup-msys2@fb197b72ce45fb24f17bf3f807a388985654d1f2 # v2.29.0
+        uses: msys2/setup-msys2@4f806de0a5a7294ffabaff804b38a9b435a73bda # v2.30.0
         with:
           msystem: MINGW64
           update: true
@@ -332,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
@@ -376,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 }}
@@ -412,7 +412,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
     - name: populate JAVA_HOME
       shell: pwsh
@@ -478,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
@@ -528,7 +528,7 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
       with:
         activate-environment: gdalenv
@@ -539,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
@@ -612,9 +619,9 @@ jobs:
       with:
         xcode-version: '15.4.0'
     - name: Checkout GDAL
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.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
@@ -699,11 +706,11 @@ jobs:
       run: |
         git config --global core.autocrlf false
     - name: Checkout GDAL
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - 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

@@ -25,7 +25,7 @@ jobs:
     container: ubuntu:20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Install Requirements
         run: |
@@ -48,7 +48,7 @@ jobs:
     container: ubuntu:24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Install Requirements
         run: |
@@ -70,7 +70,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Install Requirements
         run: |
@@ -111,7 +111,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Detect tabulations
         run: ./scripts/detect_tabulations.sh
@@ -158,23 +158,23 @@ jobs:
             sudo apt-get install -y python3 coreutils
 
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Detect binary files
         run: python3 ./scripts/check_binaries.py
 
   linting:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
   other_checks:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Install Requirements
         run: |
@@ -194,11 +194,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: Install lint tool
       run: |
         PYTHON_CMD=python3 && $PYTHON_CMD -m pip --upgrade pip
@@ -210,7 +210,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Install requirements
         run: |
@@ -227,11 +227,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: Check cmakelist
       run: |
         python scripts/collect_config_options.py
@@ -242,11 +242,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up Python
-      uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
       with:
-        python-version: 3.8
+        python-version: "3.10"
     - name: Check cmakelist
       run: |
         python scripts/collect_driver_connection_prefix.py