Merge branch 'main' into 722-psmap

OSGeo · Nov 5, 2024 · 1f57d3f · 1f57d3f
2 parents 5ec0808 + baf93a5
commit 1f57d3f
Show file tree

Hide file tree

Showing 55 changed files with 799 additions and 631 deletions.
diff --git a/.flake8 b/.flake8
@@ -88,13 +88,10 @@ per-file-ignores =
     python/grass/*/*/__init__.py: F403
     python/grass/*/*/*/__init__.py: F403
     # E402 module level import not at top of file
-    scripts/r.in.wms/wms_gdal_drv.py: E722
-    scripts/r.in.wms/wms_drv.py: E402, E722
-    scripts/r.in.wms/srs.py: E722
     scripts/r.semantic.label/r.semantic.label.py: E501
     scripts/db.out.ogr/db.out.ogr.py: F841
     scripts/g.extension/g.extension.py: E501
-    scripts/v.unpack/v.unpack.py: E501
+    scripts/v.unpack/v.unpack.py: E501n
     scripts/v.import/v.import.py: E501
     scripts/db.univar/db.univar.py: E501
     scripts/i.pansharpen/i.pansharpen.py: E501

diff --git a/.github/workflows/build_ubuntu-22.04.sh b/.github/workflows/build_ubuntu-22.04.sh
@@ -31,26 +31,26 @@ set -u
 export INSTALL_PREFIX=$1
 
 ./configure \
-    --prefix="$INSTALL_PREFIX/" \
     --enable-largefile \
-    --with-cxx \
-    --with-zstd \
-    --with-bzlib \
+    --prefix="$INSTALL_PREFIX/" \
     --with-blas \
+    --with-bzlib \
+    --with-cxx \
+    --with-fftw \
+    --with-freetype \
+    --with-freetype-includes="/usr/include/freetype2/" \
+    --with-geos \
     --with-lapack \
     --with-libsvm \
-    --with-readline \
+    --with-netcdf \
     --with-openmp \
     --with-pdal \
-    --with-pthread \
-    --with-tiff \
-    --with-freetype \
-    --with-freetype-includes="/usr/include/freetype2/" \
     --with-proj-share=/usr/share/proj \
-    --with-geos \
+    --with-pthread \
+    --with-readline \
     --with-sqlite \
-    --with-fftw \
-    --with-netcdf
+    --with-tiff \
+    --with-zstd
 
 eval $makecmd
 make install
diff --git a/.github/workflows/build_ubuntu-22.04_without_x.sh b/.github/workflows/build_ubuntu-22.04_without_x.sh
@@ -30,25 +30,25 @@ set -u
 export INSTALL_PREFIX=$1
 
 ./configure \
-    --prefix="$INSTALL_PREFIX/" \
     --enable-largefile \
-    --with-cxx \
-    --with-zstd \
-    --with-bzlib \
+    --prefix="$INSTALL_PREFIX/" \
     --with-blas \
-    --with-lapack \
-    --with-readline \
-    --without-openmp \
-    --with-pdal \
-    --without-pthread \
-    --with-tiff \
+    --with-bzlib \
+    --with-cxx \
+    --with-fftw \
     --with-freetype \
     --with-freetype-includes="/usr/include/freetype2/" \
-    --with-proj-share=/usr/share/proj \
     --with-geos \
+    --with-lapack \
+    --with-netcdf \
+    --with-pdal \
+    --with-proj-share=/usr/share/proj \
+    --with-readline \
     --with-sqlite \
-    --with-fftw \
-    --with-netcdf
+    --with-tiff \
+    --with-zstd \
+    --without-openmp \
+    --without-pthread
 
 eval $makecmd
 make install
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -58,25 +58,26 @@ jobs:
           echo "CFLAGS=${{ env.CFLAGS }}" >> $GITHUB_ENV
           echo "CXXFLAGS=${{ env.CXXFLAGS }}" >> $GITHUB_ENV
           ./configure \
-              --prefix="$HOME/install/" \
               --enable-largefile \
-              --with-cxx \
-              --with-zstd \
-              --with-bzlib \
+              --prefix="$HOME/install/" \
               --with-blas \
-              --with-lapack \
-              --with-readline \
-              --without-openmp \
-              --with-pdal \
-              --without-pthread \
-              --with-tiff \
+              --with-bzlib \
+              --with-cxx \
+              --with-fftw \
               --with-freetype \
               --with-freetype-includes="/usr/include/freetype2/" \
-              --with-proj-share=/usr/share/proj \
               --with-geos \
+              --with-lapack \
+              --with-netcdf \
+              --with-pdal \
+              --with-proj-share=/usr/share/proj \
+              --with-readline \
               --with-sqlite \
-              --with-fftw \
-              --with-netcdf
+              --with-tiff \
+              --with-zstd \
+              --without-openmp \
+              --without-pthread
+
         env:
           CFLAGS: -fPIC -g
           CXXFLAGS: -fPIC -g

diff --git a/.github/workflows/create_release_draft.yml b/.github/workflows/create_release_draft.yml
@@ -73,7 +73,7 @@ jobs:
           sha256sum ${{ env.GRASS }}.tar.xz > ${{ env.GRASS }}.tar.xz.sha256
       - name: Publish draft distribution to GitHub (for tags only)
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
+        uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2.0.9
         with:
           name: GRASS GIS ${{ github.ref_name }}
           body: |

diff --git a/.github/workflows/macos_dependencies.txt b/.github/workflows/macos_dependencies.txt
@@ -2,6 +2,7 @@ cairo
 clangxx_osx-arm64
 clang_osx-arm64
 cmake
+expat
 fftw
 flex
 freetype

diff --git a/.github/workflows/macos_install.sh b/.github/workflows/macos_install.sh
@@ -12,51 +12,51 @@ INSTALL_PREFIX=$1
 
 CONFIGURE_FLAGS="\
   --prefix=${INSTALL_PREFIX} \
-  --with-opengl=aqua \
-  --with-openmp \
-  --without-x \
+  --with-blas=openblas \
+  --with-bzlib \
+  --with-bzlib-includes=${CONDA_PREFIX}/include \
+  --with-bzlib-libs=${CONDA_PREFIX}/lib \
+  --with-cairo \
+  --with-cairo-includes=${CONDA_PREFIX}/include/cairo \
+  --with-cairo-ldflags="-lcairo" \
+  --with-cairo-libs=${CONDA_PREFIX}/lib \
+  --with-cxx \
+  --with-fftw-includes=${CONDA_PREFIX}/include \
+  --with-fftw-libs=${CONDA_PREFIX}/lib \
   --with-freetype \
   --with-freetype-includes=${CONDA_PREFIX}/include/freetype2 \
   --with-freetype-libs=${CONDA_PREFIX}/lib \
   --with-gdal=${CONDA_PREFIX}/bin/gdal-config \
-  --with-proj-includes=${CONDA_PREFIX}/include \
-  --with-proj-libs=${CONDA_PREFIX}/lib \
-  --with-proj-share=${CONDA_PREFIX}/share/proj \
   --with-geos=${CONDA_PREFIX}/bin/geos-config \
+  --with-includes=${CONDA_PREFIX}/include \
+  --with-lapack=openblas \
   --with-libpng=${CONDA_PREFIX}/bin/libpng-config \
-  --with-tiff-includes=${CONDA_PREFIX}/include \
-  --with-tiff-libs=${CONDA_PREFIX}/lib \
-  --with-postgres=yes \
-  --with-postgres-includes=${CONDA_PREFIX}/include \
-  --with-postgres-libs=${CONDA_PREFIX}/lib \
-  --without-mysql \
-  --with-sqlite \
-  --with-sqlite-libs=${CONDA_PREFIX}/lib \
-  --with-sqlite-includes=${CONDA_PREFIX}/include \
-  --with-fftw-includes=${CONDA_PREFIX}/include \
-  --with-fftw-libs=${CONDA_PREFIX}/lib \
-  --with-cxx \
-  --with-cairo \
-  --with-cairo-includes=${CONDA_PREFIX}/include/cairo \
-  --with-cairo-libs=${CONDA_PREFIX}/lib \
-  --with-cairo-ldflags="-lcairo" \
-  --with-zstd \
-  --with-zstd-libs=${CONDA_PREFIX}/lib \
-  --with-zstd-includes=${CONDA_PREFIX}/include \
-  --with-bzlib \
-  --with-bzlib-libs=${CONDA_PREFIX}/lib \
-  --with-bzlib-includes=${CONDA_PREFIX}/include \
+  --with-libs=${CONDA_PREFIX}/lib \
   --with-netcdf=${CONDA_PREFIX}/bin/nc-config \
-  --with-blas=openblas \
-  --with-lapack=openblas \
   --with-netcdf=${CONDA_PREFIX}/bin/nc-config \
   --with-nls \
-  --with-libs=${CONDA_PREFIX}/lib \
-  --with-includes=${CONDA_PREFIX}/include \
+  --with-opengl=aqua \
+  --with-openmp \
   --with-pdal \
+  --with-postgres-includes=${CONDA_PREFIX}/include \
+  --with-postgres-libs=${CONDA_PREFIX}/lib \
+  --with-postgres=yes \
+  --with-proj-includes=${CONDA_PREFIX}/include \
+  --with-proj-libs=${CONDA_PREFIX}/lib \
+  --with-proj-share=${CONDA_PREFIX}/share/proj \
   --with-readline \
   --with-readline-includes=${CONDA_PREFIX}/include/readline \
   --with-readline-libs=${CONDA_PREFIX}/lib
+  --with-sqlite \
+  --with-sqlite-includes=${CONDA_PREFIX}/include \
+  --with-sqlite-libs=${CONDA_PREFIX}/lib \
+  --with-tiff-includes=${CONDA_PREFIX}/include \
+  --with-tiff-libs=${CONDA_PREFIX}/lib \
+  --with-zstd \
+  --with-zstd-includes=${CONDA_PREFIX}/include \
+  --with-zstd-libs=${CONDA_PREFIX}/lib \
+  --without-mysql \
+  --without-x \
 "
 
 export CFLAGS="-O2 -pipe -arch ${CONDA_ARCH} -DGL_SILENCE_DEPRECATION -Wall -Wextra -Wpedantic -Wvla"

diff --git a/.github/workflows/optional_requirements.txt b/.github/workflows/optional_requirements.txt
@@ -1,4 +1,4 @@
 folium
+ipyleaflet
 jupyter
 PyVirtualDisplay
-ipyleaflet
diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
@@ -36,7 +36,7 @@ jobs:
       # renovate: datasource=pypi depName=bandit
       BANDIT_VERSION: "1.7.10"
       # renovate: datasource=pypi depName=ruff
-      RUFF_VERSION: "0.7.1"
+      RUFF_VERSION: "0.7.2"
 
     runs-on: ${{ matrix.os }}
     permissions:

diff --git a/.github/workflows/test-nix.yml b/.github/workflows/test-nix.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Install nix
-        uses: DeterminateSystems/nix-installer-action@da36cb69b1c3247ad7a1f931ebfd954a1105ef14 # v14
+        uses: DeterminateSystems/nix-installer-action@b92f66560d6f97d6576405a7bae901ab57e72b6a # v15
 
       - name: Setup cachix
         uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15

diff --git a/.gunittest.cfg b/.gunittest.cfg
@@ -12,8 +12,8 @@ exclude =
     python/grass/temporal/testsuite/unittests_temporal_raster_algebra_equal_ts.py
     python/grass/temporal/testsuite/unittests_temporal_raster_conditionals_complement_else.py
     raster/r.in.lidar/testsuite/test_base_resolution.sh
-    temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
     temporal/t.connect/testsuite/test_distr_tgis_db_raster.py
+    temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
     temporal/t.connect/testsuite/test_distr_tgis_db_vector.py
     temporal/t.info/testsuite/test.t.info.sh
     temporal/t.rast.aggregate/testsuite/test_aggregation_relative.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -37,7 +37,7 @@ repos:
           )
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.7.1
+    rev: v0.7.2
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/.travis/linux.script.sh b/.travis/linux.script.sh
@@ -11,28 +11,28 @@ echo "MAKEFLAGS is '$MAKEFLAGS'"
 
 ./configure --host=x86_64-linux-gnu \
             --build=x86_64-linux-gnu \
+            --enable-largefile \
+            --enable-shared \
             --prefix=/usr/lib \
-            --sysconfdir=/etc \
             --sharedstatedir=/var \
-            --enable-shared \
-            --with-postgres \
+            --sysconfdir=/etc \
+            --with-blas \
+            --with-cairo \
             --with-cxx \
-            --with-gdal \
             --with-freetype \
-            --with-readline \
-            --with-nls \
-            --with-odbc \
+            --with-freetype-includes=/usr/include/freetype2/ \
+            --with-gdal \
             --with-geos \
             --with-lapack \
             --with-netcdf \
-            --with-blas \
-            --with-sqlite \
-            --with-zstd \
-            --enable-largefile \
-            --with-freetype-includes=/usr/include/freetype2/ \
+            --with-nls \
+            --with-odbc \
+            --with-pdal \
+            --with-postgres \
             --with-postgres-includes=/usr/include/postgresql/ \
             --with-proj-share=/usr/share/proj \
-            --with-cairo \
-            --with-pdal
+            --with-readline \
+            --with-sqlite \
+            --with-zstd
 
 make CFLAGS="$CFLAGS $GRASS_EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $GRASS_EXTRA_CXXFLAGS"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.10@sha256:865e5dd094beca432e8c0a1d5e1c465db5f998dca4e439981029b3b81fb39ed5
+# syntax=docker/dockerfile:1.11@sha256:1f2be5a2aa052cbd9aedf893d17c63277c3d1c51b3fb0f3b029c6b34f658d057
 
 # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
 #       Changes to this file must be copied over to the other file.
@@ -131,9 +131,9 @@ ARG GRASS_CONFIG="\
   "
 
 ARG GRASS_PYTHON_PACKAGES="\
-    Pillow \
     matplotlib \
     numpy \
+    Pillow \
     pip \
     ply \
     psycopg2 \

diff --git a/Vagrantfile b/Vagrantfile
@@ -43,39 +43,39 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     packageList = [
       "autoconf2.69",
       "autotools-dev",
-      "make",
+      "bison",
+      "flex",
       "g++",
       "gettext",
-      "flex",
-      "bison",
+      "libblas-dev",
       "libcairo2-dev",
       "libfftw3-dev",
       "libfreetype6-dev",
       "libgdal-dev",
       "libgeos-dev",
       "libglu1-mesa-dev",
       "libjpeg-dev",
-      "libpng-dev",
-      "libtiff-dev",
+      "liblapack-dev",
       "libmysqlclient-dev",
       "libncurses5-dev",
+      "libnetcdf-dev",
+      "libpng-dev",
       "libpq-dev",
       "libproj-dev",
-      "proj-bin",
       "libreadline-dev",
       "libsqlite3-dev",
+      "libtiff-dev",
       "libxmu-dev",
+      "make",
+      "netcdf-bin",
+      "proj-bin",
       "python3",
-      "python3-wxgtk4.0",
       "python3-dateutil",
       "python3-dev",
       "python3-numpy",
-      "python3-ply",
       "python3-pil",
-      "libnetcdf-dev",
-      "netcdf-bin",
-      "libblas-dev",
-      "liblapack-dev",
+      "python3-ply",
+      "python3-wxgtk4.0",
       "unixodbc-dev",
       "zlib1g-dev",
       # "libpdal-dev"

diff --git a/binder/apt.txt b/binder/apt.txt
@@ -19,7 +19,6 @@ liblapack-dev
 libncurses5-dev
 libnetcdf-dev
 libpdal-dev
-libgeos-dev
 libpng-dev
 libpq-dev
 libproj-dev