innFactory · pull · Dec 23, 2023 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,17 +7,19 @@ should be formatted as "component/filename: Describe what the commit does (fixes
 so that anyone that parses 'git log' immediately knows what a commit is about.
 Do not hesitate to provide more context in the longer part of the commit message.
 
-GOOD: "GTiff: fix wrong color interpretation with -co ALPHA=YES (fixes #1234)
+For example:
+
+"GTiff: fix wrong color interpretation with -co ALPHA=YES (fixes #1234)
 
 When -co ALPHA=YES was used, but PHOTOMETRIC was not specified, the ExtraSample
 tag was wrongly set to unspecified.
 "
 
-BAD: "Fix crash", "fix #1234"
+The GDAL project requires specific code formatting for C/C++ and Python code.
+This is largely automated with the pre-commit tool.
+Consult how to [install and set it up](https://gdal.org/development/dev_practices.html#commit-hooks)
 
-In case you need several iterations to make continuous integration happy,
-please squash your commits in a single one at the end. See
-[Contributing](https://github.com/OSGeo/gdal/blob/master/CONTRIBUTING.md)
+More generally, consult [development practices](https://gdal.org/development/dev_practices.html)
 -->
 
 ## What does this PR do?
@@ -27,6 +29,7 @@ please squash your commits in a single one at the end. See
 ## Tasklist
 
  - [ ] ADD YOUR TASKS HERE
+ - [ ] Make sure code is correctly formatted (cf [pre-commit configuration](https://gdal.org/development/dev_practices.html#commit-hooks))
  - [ ] Add test case(s)
  - [ ] Add documentation
  - [ ] Updated Python API documentation (swig/include/python/docs/)

diff --git a/.github/workflows/alpine/Dockerfile.ci b/.github/workflows/alpine/Dockerfile.ci
@@ -1,30 +1,75 @@
 FROM alpine:edge
 
 RUN apk add \
-    linux-headers gnu-libiconv-dev \
-    g++ make ccache cmake \
-    proj-dev proj proj-util \
-    curl-dev tiff-dev \
-    zlib-dev zstd-dev xz-dev snappy-dev \
-    libjpeg-turbo-dev libpng-dev openjpeg-dev libwebp-dev expat-dev libkml-dev \
-    py3-numpy-dev python3-dev py3-setuptools py3-numpy py3-pip swig \
-    poppler-dev postgresql-dev \
-    openexr-dev libheif-dev xerces-c-dev geos-dev cfitsio-dev \
-    netcdf-dev libaec-dev hdf5-dev freexl-dev \
-    lz4-dev blosc-dev libdeflate-dev brotli-dev uriparser-dev \
+    apache-arrow-dev \
+    armadillo-dev \
+    basisu-dev \
+    blosc-dev \
+    brunsli-dev \
+    ccache \
+    cfitsio-dev \
+    cmake \
+    curl-dev \
+    expat-dev \
+    freexl-dev \
+    gcc \
+    g++ \
+    geos-dev \
+    giflib-dev \
+    gnu-libiconv-dev \
+    hdf5-dev \
+    json-c-dev \
+    kealib-dev \
+    libaec-dev \
     libarchive-dev \
-    kealib-dev libjxl-dev \
-    json-c-dev giflib-dev \
-    libspatialite-dev librasterlite2-dev \
+    libdeflate-dev \
+    libgeotiff-dev \
+    libheif-dev \
+    libjpeg-turbo-dev \
+    libjxl-dev \
+    libkml-dev \
+    libpng-dev \
+    libpq-dev \
+    librasterlite2-dev \
+    libspatialite-dev \
+    libtirpc-dev \
+    libwebp-dev \
+    libxml2-dev \
+    libxslt-dev \
+    linux-headers \
+    lz4-dev \
+    make \
     mariadb-connector-c-dev \
+    netcdf-dev \
+    odbc-cpp-wrapper-dev \
+    ogdi-dev \
+    openexr-dev \
+    openjpeg-dev \
+    openssl-dev \
     pcre2-dev \
+    podofo-dev \
+    poppler-dev \
+    proj-dev \
+    proj-util \
+    py3-pyarrow \
+    py3-pyarrow-pyc \
+    py3-numpy \
+    py3-numpy-dev \
+    py3-pip \
+    py3-setuptools \
+    python3-dev \
     qhull-dev \
+    sfcgal-dev \
+    snappy-dev \
+    sqlite-dev \
+    swig \
+    tiledb-dev \
+    tiff-dev \
     unixodbc-dev \
-    libpq-dev \
-    apache-arrow-dev \
-    py3-pyarrow py3-pyarrow-pyc \
-    libxml2-dev \
-    podofo-dev
+    xerces-c-dev \
+    xz-dev \
+    zlib-dev \
+    zstd-dev
 
 COPY requirements.txt /tmp/
 RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
diff --git a/.github/workflows/alpine_32bit/Dockerfile.ci b/.github/workflows/alpine_32bit/Dockerfile.ci
@@ -1,31 +1,75 @@
-FROM i386/alpine:3.18
+FROM i386/alpine:edge
 
 RUN apk add \
+    apache-arrow-dev \
+    armadillo-dev \
     bash \
-    linux-headers gnu-libiconv-dev \
-    g++ make ccache cmake \
-    proj-dev proj proj-util \
-    curl-dev tiff-dev \
-    zlib-dev zstd-dev xz-dev snappy-dev \
-    libjpeg-turbo-dev libpng-dev openjpeg-dev libwebp-dev expat-dev libkml-dev \
-    py3-numpy-dev python3-dev py3-setuptools py3-numpy py3-pip swig \
-    poppler-dev postgresql-dev \
-    openexr-dev libheif-dev xerces-c-dev geos-dev cfitsio-dev \
-    netcdf-dev libaec-dev hdf5-dev freexl-dev \
-    lz4-dev blosc-dev libdeflate-dev brotli-dev uriparser-dev \
+    basisu-dev \
+    blosc-dev \
+    brunsli-dev \
+    ccache \
+    cfitsio-dev \
+    cmake \
+    curl-dev \
+    expat-dev \
+    freexl-dev \
+    gcc \
+    g++ \
+    geos-dev \
+    giflib-dev \
+    gnu-libiconv-dev \
+    hdf5-dev \
+    json-c-dev \
+    kealib-dev \
+    libaec-dev \
     libarchive-dev \
-    kealib-dev libjxl-dev \
-    json-c-dev giflib-dev \
-    libspatialite-dev librasterlite2-dev \
+    libdeflate-dev \
+    libgeotiff-dev \
+    libheif-dev \
+    libjpeg-turbo-dev \
+    libjxl-dev \
+    libkml-dev \
+    libpng-dev \
+    libpq-dev \
+    librasterlite2-dev \
+    libspatialite-dev \
+    libtirpc-dev \
+    libwebp-dev \
+    libxml2-dev \
+    libxslt-dev \
+    linux-headers \
+    lz4-dev \
+    make \
     mariadb-connector-c-dev \
+    netcdf-dev \
+    odbc-cpp-wrapper-dev \
+    ogdi-dev \
+    openexr-dev \
+    openjpeg-dev \
+    openssl-dev \
     pcre2-dev \
+    podofo-dev \
+    poppler-dev \
+    proj-dev \
+    proj-util \
+    py3-pyarrow \
+    py3-pyarrow-pyc \
+    py3-numpy \
+    py3-numpy-dev \
+    py3-pip \
+    py3-setuptools \
+    python3-dev \
     qhull-dev \
+    sfcgal-dev \
+    snappy-dev \
+    sqlite-dev \
+    swig \
+    tiff-dev \
     unixodbc-dev \
-    libpq-dev \
-    apache-arrow-dev \
-    py3-pyarrow \
-    libxml2-dev libxslt-dev \
-    podofo-dev
+    xerces-c-dev \
+    xz-dev \
+    zlib-dev \
+    zstd-dev
 
 COPY requirements.txt /tmp/
 RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
@@ -29,7 +29,7 @@ jobs:
         fuzz-seconds: 600
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
@@ -498,6 +498,7 @@ jobs:
     env:
         architecture: x64
         generator: Visual Studio 17 2022
+        GDAL_PYTHON_BINDINGS_WITHOUT_NUMPY: YES
     steps:
     # To avoid git clone to mess with the line endings of GDAL autotest data
     # files that look like text, but should be handled as binary content
@@ -586,7 +587,7 @@ jobs:
         brew update
         brew outdated
         brew unlink python
-        brew install --overwrite python@3.10 python@3.11
+        brew install --overwrite python@3.11 python@3.12
         brew install postgresql || brew link postgresql
         brew install pkg-config freexl libxml2 libspatialite geos proj libgeotiff openjpeg giflib libaec postgis poppler doxygen unixodbc jpeg-turbo aom jpeg-xl libheif libarchive libkml boost
         brew install ccache swig

diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
       - uses: pre-commit/[email protected]
 
   doxygen:
@@ -127,7 +127,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.8
     - name: Install lint tool

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
@@ -72,7 +72,7 @@ jobs:
           source ../ci/travis/conda/compile.sh
       working-directory: ./gdal-feedstock
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.platform }}-conda-package
         path: ./gdal-feedstock/packages/

diff --git a/.github/workflows/coverage/services.sh b/.github/workflows/coverage/services.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+set -ex
+
+##################
+# Start services #
+##################
+
+# MySQL 8
+docker rm -f gdal-mysql1
+docker run --name gdal-mysql1 -e MYSQL_ROOT_PASSWORD=passwd -e "MYSQL_ROOT_HOST=%" -p 33060:3306 -d mysql/mysql-server:8.0.18 mysqld --default-authentication-plugin=mysql_native_password
+
+# MariaDB 10.3.9
+docker rm -f gdal-mariadb
+docker run --name gdal-mariadb -e MYSQL_ROOT_PASSWORD=passwd -e "MYSQL_ROOT_HOST=%" -p 33061:3306 -d mariadb:10.3.9
+
+# PostGIS
+docker rm -f gdal-postgis
+docker run -v /home:/home --name "gdal-postgis" -p 25432:5432 -e ALLOW_IP_RANGE=0.0.0.0/0 -d -t kartoza/postgis:13.0
+
+######################
+# Configure services #
+######################
+
+sleep 10
+
+# MySQL
+docker exec gdal-mysql1 sh -c "echo 'CREATE DATABASE test; SELECT Version()' | mysql -uroot -ppasswd"
+
+# MariaDB
+docker exec gdal-mariadb sh -c "echo 'CREATE DATABASE test; SELECT Version()' | mysql -uroot -ppasswd"
+
+# PostGIS
+docker exec -e PGPASSWORD=docker gdal-postgis psql -h localhost -U docker -d gis -c "CREATE DATABASE autotest"
+docker exec -e PGPASSWORD=docker gdal-postgis psql -h localhost -U docker -d autotest -c "CREATE EXTENSION postgis; CREATE EXTENSION postgis_raster; SELECT postgis_full_version()"
+
diff --git a/.github/workflows/coverage/test.sh b/.github/workflows/coverage/test.sh
@@ -6,6 +6,23 @@ export OGR_HANA_CONNECTION_STRING='DRIVER=/usr/sap/hdbclient/libodbcHDB.so;HOST=
 
 ctest -V -j $(nproc)
 
+# Run extra tests depending on services
+export PYTEST="python3 -m pytest -vv -p no:sugar --color=no"
+
+. ../scripts/setdevenv.sh
+
+IP=host.docker.internal
+
+# MySQL 8
+(cd autotest && OGR_MYSQL_CONNECTION_STRING=mysql:test,user=root,password=passwd,port=33060,host=$IP $PYTEST ogr/ogr_mysql.py)
+# MariaDB 10.3.9
+(cd autotest && OGR_MYSQL_CONNECTION_STRING=mysql:test,user=root,password=passwd,port=33061,host=$IP $PYTEST ogr/ogr_mysql.py)
+
+# PostGIS tests
+(cd autotest && OGR_PG_CONNECTION_STRING="host=$IP port=25432 dbname=autotest user=docker password=docker" $PYTEST --capture=no -ra ogr/ogr_pg.py)
+(cd autotest && PGHOST="$IP" PGPORT=25432 PGUSER=docker PGPASSWORD=docker $PYTEST --capture=no -ra gdrivers/postgisraster.py)
+
+# Generate coverage report
 lcov --directory . --capture --output-file gdal.info 2>/dev/null
 cp gdal.info gdal_filtered.info
 lcov --remove gdal_filtered.info '/usr/*' --output-file gdal_filtered.info

diff --git a/.github/workflows/doc_build.yml b/.github/workflows/doc_build.yml
@@ -83,15 +83,15 @@ jobs:
     #  run: |
     #    make spelling
     #  working-directory: ./doc
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: PDF
         path: doc/build/latex/gdal.pdf
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: HTML
         path: doc/build/html/*
-    #- uses: actions/upload-artifact@v3
+    #- uses: actions/upload-artifact@v4
     #  with:
     #    name: Misspelled
     #    path: doc/build/spelling/output.txt

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
@@ -102,6 +102,7 @@ jobs:
             id: coverage
             travis_branch: ubuntu_2004
             container: ubuntu_20.04
+            before_test_script: services.sh
             build_script: build.sh
             test_script: test.sh
 
@@ -319,14 +320,14 @@ jobs:
           docker push ${CONTAINER_NAME_FULL}
 
       - name: Upload coverage artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.id == 'coverage' }}
         with:
           name: coverage_index.html
           path: build-${{ matrix.id }}/coverage_html/index.html
 
       - name: Upload coverage artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ matrix.id == 'coverage' }}
         with:
           name: HTML