Merge branch 'main' into ubuntu-max-py313

.flake8

@@ -25,12 +25,6 @@ per-file-ignores =
     doc/python/m.distance.py: E501
     doc/gui/wxpython/example/dialogs.py: F401
     gui/scripts/d.wms.py: E501
-    gui/wxpython/core/gconsole.py: E722
-    gui/wxpython/core/render.py: E722
-    gui/wxpython/core/settings.py: E722
-    gui/wxpython/core/toolboxes.py: E722
-    gui/wxpython/core/utils.py: E722
-    gui/wxpython/core/workspace.py: E722
     gui/wxpython/datacatalog/tree.py: E731, E402
     gui/wxpython/dbmgr/base.py: E722
     gui/wxpython/dbmgr/dialogs.py: E722

.github/workflows/codeql-analysis.yml

@@ -56,7 +56,7 @@ jobs:
         if: ${{ matrix.language == 'c-cpp' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -81,6 +81,6 @@ jobs:
         run: .github/workflows/build_ubuntu-22.04.sh "${HOME}/install"
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/python-code-quality.yml

@@ -135,7 +135,7 @@ jobs:
           path: bandit.sarif
 
       - name: Upload SARIF File into Security Tab
-        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           sarif_file: bandit.sarif
 

.pre-commit-config.yaml

@@ -43,7 +43,7 @@ repos:
       - id: ruff
         args: [--fix, --preview]
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.42.0
     hooks:
       - id: markdownlint-fix
   # Using this mirror lets us use mypyc-compiled black, which is about 2x faster

Dockerfile

@@ -19,17 +19,16 @@ WORKDIR /tmp
 ARG GUI
 
 # Todo: re-consider required dev packages for addons (~400MB in dev packages)
-ARG GRASS_RUN_PACKAGES="build-essential \
+ARG GRASS_RUN_PACKAGES="\
     bison \
+    build-essential \
     bzip2 \
     curl \
     flex \
     g++ \
     gcc \
     gdal-bin \
     geos-bin \
-    proj-bin \
-    netcdf-bin \
     git \
     language-pack-en-base \
     libcairo2 \
@@ -38,28 +37,29 @@ ARG GRASS_RUN_PACKAGES="build-essential \
     libfftw3-dev \
     libfreetype6 \
     libgdal-dev \
+    libgeos-dev \
+    libgsl-dev \
     libgsl27 \
     libjpeg-turbo8 \
     libjsoncpp-dev \
-    libmagic1 \
+    liblapacke-dev \
     libmagic-mgc \
+    libmagic1 \
     libncurses5 \
-    libopenblas-dev \
+    libomp-dev \
+    libomp5 \
     libopenblas-base \
+    libopenblas-dev \
     libopenjp2-7 \
-    libomp5 \
-    libomp-dev \
-    libgeos-dev \
-    libpdal-dev \
-    libproj-dev \
-    libpq-dev \
-    libgsl-dev \
     libpdal-base13 \
+    libpdal-dev \
     libpdal-plugin-hdf \
     libpdal-plugins \
     libpdal-util13 \
     libpnglite0 \
+    libpq-dev \
     libpq5 \
+    libproj-dev \
     libpython3-all-dev \
     libreadline8 \
     libsqlite3-0 \
@@ -70,7 +70,9 @@ ARG GRASS_RUN_PACKAGES="build-essential \
     mesa-utils \
     moreutils \
     ncurses-bin \
+    netcdf-bin \
     pdal \
+    proj-bin \
     proj-data \
     python-is-python3 \
     python3 \
@@ -86,56 +88,58 @@ ARG GRASS_RUN_PACKAGES="build-essential \
 ENV GRASS_RUN_PACKAGES=${GRASS_RUN_PACKAGES}
 
 # Define build packages
-ARG GRASS_BUILD_PACKAGES="cmake \
+ARG GRASS_BUILD_PACKAGES="\
+    cmake \
     libbz2-dev \
     libcairo2-dev \
     libfreetype6-dev \
-    zlib1g-dev \
+    libjpeg-dev \
+    libncurses5-dev \
     libnetcdf-dev \
     libopenjp2-7-dev \
-    libreadline-dev \
-    libjpeg-dev \
     libpnglite-dev \
+    libreadline-dev \
     libsqlite3-dev \
     libtiff-dev \
     libzstd-dev \
-    libncurses5-dev \
     mesa-common-dev \
     zlib1g-dev \
     "
 ENV GRASS_BUILD_PACKAGES=${GRASS_BUILD_PACKAGES}
 
-ARG GRASS_CONFIG="--with-cxx \
+ARG GRASS_CONFIG="\
   --enable-largefile \
-  --with-proj-share=/usr/share/proj \
-  --with-gdal=/usr/bin/gdal-config \
-  --with-geos \
-  --with-sqlite \
+  --with-blas \
+  --with-bzlib \
   --with-cairo --with-cairo-ldflags=-lfontconfig \
-  --with-freetype --with-freetype-includes=/usr/include/freetype2/ \
+  --with-cxx \
   --with-fftw \
-  --with-postgres --with-postgres-includes=/usr/include/postgresql \
-  --with-netcdf \
-  --with-zstd \
-  --with-bzlib \
-  --with-pdal \
-  --without-mysql \
-  --with-blas \
+  --with-freetype --with-freetype-includes=/usr/include/freetype2/ \
+  --with-gdal=/usr/bin/gdal-config \
+  --with-geos \
   --with-lapack \
-  --with-readline \
+  --with-netcdf \
   --with-odbc \
   --with-openmp \
+  --with-pdal \
+  --with-postgres --with-postgres-includes=/usr/include/postgresql \
+  --with-proj-share=/usr/share/proj \
+  --with-readline \
+  --with-sqlite \
+  --with-zstd \
+  --without-mysql \
   "
 
-ARG GRASS_PYTHON_PACKAGES="pip \
-    setuptools \
-    python-dateutil \
-    python-magic \
-    numpy \
+ARG GRASS_PYTHON_PACKAGES="\
     Pillow \
-    ply \
     matplotlib \
+    numpy \
+    pip \
+    ply \
     psycopg2 \
+    python-dateutil \
+    python-magic \
+    setuptools \
   "
 ENV GRASS_PYTHON_PACKAGES=${GRASS_PYTHON_PACKAGES}
 
@@ -147,31 +151,33 @@ ENV GRASS_CONFIG=${GRASS_CONFIG}
 
 FROM common_start as grass_with_gui
 
-ARG GRASS_RUN_PACKAGES="${GRASS_RUN_PACKAGES} adwaita-icon-theme-full \
-  libglu1-mesa \
-  libgtk-3-0 \
-  libnotify4 \
-  libsdl2-2.0-0 \
-  libxtst6 \
-  librsvg2-common \
-  gettext \
+ARG GRASS_RUN_PACKAGES="${GRASS_RUN_PACKAGES} \
+  adwaita-icon-theme-full \
   freeglut3 \
+  gettext \
+  libglu1-mesa \
   libgstreamer-plugins-base1.0 \
+  libgtk-3-0 \
   libjpeg8 \
+  libnotify4 \
   libpng16-16 \
+  librsvg2-common \
+  libsdl2-2.0-0 \
   libsm6 \
   libtiff5 \
   libwebkit2gtk-4.0 \
+  libxtst6 \
 "
 # librsvg2-common \
 # (fix error (wxgui.py:7782): Gtk-WARNING **: 19:53:09.774:
 # Could not load a pixbuf from /org/gtk/libgtk/theme/Adwaita/assets/check-symbolic.svg.
 # This may indicate that pixbuf loaders or the mime database could not be found.)
 
-ARG GRASS_BUILD_PACKAGES="${GRASS_BUILD_PACKAGES} adwaita-icon-theme-full \
+ARG GRASS_BUILD_PACKAGES="${GRASS_BUILD_PACKAGES} \
+  adwaita-icon-theme-full \
+  freeglut3-dev \
   libgl1-mesa-dev \
   libglu1-mesa-dev \
-  freeglut3-dev \
   libgstreamer-plugins-base1.0-dev \
   libgtk-3-dev \
   libjpeg-dev \
@@ -184,10 +190,11 @@ ARG GRASS_BUILD_PACKAGES="${GRASS_BUILD_PACKAGES} adwaita-icon-theme-full \
   libxtst-dev \
 "
 
-ARG GRASS_CONFIG="${GRASS_CONFIG} --with-opengl \
-  --with-x \
+ARG GRASS_CONFIG="${GRASS_CONFIG} \
   --with-nls \
+  --with-opengl \
   --with-readline \
+  --with-x \
   "
 ARG GRASS_PYTHON_PACKAGES="${GRASS_PYTHON_PACKAGES} wxPython"
 # If you do not use any Gnome Accessibility features, to suppress warning

docker/alpine/Dockerfile

@@ -11,9 +11,9 @@ ARG PYTHON_VERSION=3
 # List of packages to be installed (proj-data omitted: 570.04 MB)
 ENV GRASS_RUN_PACKAGES="\
       attr \
-      build-base \
       bash \
       bison \
+      build-base \
       bzip2 \
       cairo \
       curl \
@@ -29,15 +29,15 @@ ENV GRASS_RUN_PACKAGES="\
       gdal-driver-JP2OpenJPEG \
       gdal-driver-LIBKML \
       gdal-driver-MSSQLSpatial \
-      gdal-driver-netCDF \
       gdal-driver-ODBC \
       gdal-driver-PG \
       gdal-driver-PNG \
       gdal-driver-WMS \
+      gdal-driver-netCDF \
       gdal-tools \
-      gettext \
       geos \
       geos-dev \
+      gettext \
       git \
       gnutls \
       jsoncpp \
@@ -52,15 +52,15 @@ ENV GRASS_RUN_PACKAGES="\
       musl \
       musl-utils \
       ncurses \
-      openjpeg \
       openblas \
-      py3-numpy \
-      py3-pillow \
-      python3 \
+      openjpeg \
       pdal \
       pdal-dev \
       postgresql15-client \
       proj-util \
+      py3-numpy \
+      py3-pillow \
+      python3 \
       sqlite \
       sqlite-libs \
       subversion \
@@ -89,23 +89,23 @@ FROM common as build
 # set configuration options, without wxGUI
 ENV GRASS_CONFIG="\
       --enable-largefile \
+      --with-bzlib \
+      --with-cairo --with-cairo-ldflags=-lfontconfig \
       --with-cxx \
-      --with-proj-share=/usr/share/proj \
+      --with-fftw \
       --with-gdal \
-      --with-pdal \
       --with-geos \
+      --with-openmp \
+      --with-pdal \
+      --with-postgres --with-postgres-includes=/usr/include/postgresql \
+      --with-proj-share=/usr/share/proj \
       --with-sqlite \
-      --with-bzlib \
       --with-zstd \
-      --with-cairo --with-cairo-ldflags=-lfontconfig \
-      --with-fftw \
-      --with-postgres --with-postgres-includes=/usr/include/postgresql \
-      --with-openmp \
       --without-freetype \
-      --without-opengl \
-      --without-nls \
       --without-mysql \
+      --without-nls \
       --without-odbc \
+      --without-opengl \
       "
 
 # Set environmental variables for GRASS GIS compilation, without debug symbols
@@ -132,13 +132,13 @@ ENV GRASS_BUILD_PACKAGES="\
       libjpeg-turbo-dev \
       libpng-dev \
       libpq-dev \
-      openjpeg-dev \
       openblas-dev \
+      openjpeg-dev \
       pdal \
       pdal-dev \
       proj-dev \
-      python3-dev \
       py3-numpy-dev \
+      python3-dev \
       sqlite-dev \
       tar \
       tiff-dev \