Merge branch 'OSGeo:main' into main

.flake8

@@ -20,10 +20,8 @@ per-file-ignores =
     # F841 local variable assigned to but never used
     # E741 ambiguous variable name 'l'
     __init__.py: F401, F403
-    lib/init/grass.py: E722, F821, F841, W605
-    utils/mkrest.py: W605
-    utils/gitlog2changelog.py: E722, E712, W605
-    utils/g.html2man/ggroff.py: W605
+    lib/init/grass.py: E722, F821, F841
+    utils/gitlog2changelog.py: E722, E712
     man/build_check_rest.py: F403, F405
     man/build_full_index_rest.py: F403, F405
     man/parser_standard_options.py: F403, F405
@@ -45,10 +43,9 @@ per-file-ignores =
     gui/scripts/d.wms.py: E501
     gui/wxpython/core/gcmd.py: E402
     gui/wxpython/core/gthread.py: F841
-    gui/wxpython/core/gconsole.py: E722, W605
-    gui/wxpython/core/globalvar.py: W605
+    gui/wxpython/core/gconsole.py: E722
     gui/wxpython/core/toolboxes.py: E722
-    gui/wxpython/core/utils.py: E722, F841, W605
+    gui/wxpython/core/utils.py: E722, F841
     gui/wxpython/core/workspace.py: E722
     gui/wxpython/core/render.py: E722, F841
     gui/wxpython/core/ws.py: F841
@@ -64,8 +61,8 @@ per-file-ignores =
     gui/wxpython/gcp/g.gui.gcp.py: F841
     gui/wxpython/gcp/manager.py: F841, E722
     gui/wxpython/gcp/mapdisplay.py: F841
-    gui/wxpython/gui_core/*: F841, E266, E722, W605
-    gui/wxpython/gui_core/dialogs.py: E722, F841, W605
+    gui/wxpython/gui_core/*: F841, E266, E722
+    gui/wxpython/gui_core/dialogs.py: E722, F841
     gui/wxpython/gui_core/forms.py: E722, F841
     gui/wxpython/gui_core/ghelp.py: E722
     gui/wxpython/gui_core/gselect.py: F841, E266, E722
@@ -76,12 +73,12 @@ per-file-ignores =
     gui/wxpython/image2target/g.gui.image2target.py: E501, E265, F841
     gui/wxpython/iscatt/*: F841, E722, E741, F405, F403
     gui/wxpython/lmgr/giface.py: E741
-    gui/wxpython/lmgr/frame.py: F841, E722, W605
+    gui/wxpython/lmgr/frame.py: F841, E722
     # layertree still includes some formatting issues (it is ignored by Black)
     gui/wxpython/lmgr/layertree.py: E722, E266, W504, E225
     gui/wxpython/lmgr/workspace.py: F841
-    gui/wxpython/modules/*: F841, E722, W605
-    gui/wxpython/nviz/*: F841, E266, E722, W605, F403, F405
+    gui/wxpython/modules/*: F841, E722
+    gui/wxpython/nviz/*: F841, E266, E722, F403, F405
     gui/wxpython/photo2image/*: F841, E722, E265
     gui/wxpython/photo2image/g.gui.photo2image.py: E501, F841
     gui/wxpython/psmap/*: F841, E266, E722, F405, F403
@@ -116,7 +113,7 @@ per-file-ignores =
     gui/wxpython/timeline/frame.py: E741
     gui/wxpython/tools/build_modules_xml.py: E722
     gui/wxpython/web_services/cap_interface.py: E501
-    gui/wxpython/web_services/widgets.py: F841, E741, W605, E402
+    gui/wxpython/web_services/widgets.py: F841, E741, E402
     gui/wxpython/rlisetup/frame.py: E741
     gui/wxpython/rlisetup/sampling_frame.py: F841
     gui/wxpython/rlisetup/wizard.py: E722, E741
@@ -129,20 +126,15 @@ per-file-ignores =
     # TODO: Is this really needed?
     python/grass/pygrass/vector/__init__.py: E402
     python/grass/pygrass/raster/__init__.py: E402
-    python/grass/gunittest/gmodules.py: W605
     python/grass/gunittest/invoker.py: E721
-    python/grass/pygrass/vector/geometry.py: W605
     python/grass/pygrass/vector/__init__.py: E402
     python/grass/pygrass/modules/interface/*.py: F401
-    python/grass/pygrass/modules/interface/module.py: W605
-    python/grass/pygrass/modules/interface/parameter.py: W605
     python/grass/pygrass/modules/grid/*.py: F401
     python/grass/pygrass/raster/rowio.py: E741
     python/grass/pygrass/raster/category.py: E721
     python/grass/pygrass/rpc/__init__.py: F401, F403
     python/grass/pygrass/utils.py: E402
-    python/grass/script/task.py: W605
-    python/grass/temporal/abstract_space_time_dataset.py: W605, F841, E722
+    python/grass/temporal/abstract_space_time_dataset.py: F841, E722
     python/grass/temporal/c_libraries_interface.py: F841, E722
     python/grass/temporal/core.py: E722
     python/grass/temporal/datetime_math.py: F841, E722

.github/workflows/codeql-analysis.yml

@@ -56,7 +56,7 @@ jobs:
         if: ${{ matrix.language == 'c-cpp' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         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@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/docker.yml

@@ -70,7 +70,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
       - name: Login to DockerHub
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN  }}

.github/workflows/macos.yml

@@ -55,6 +55,7 @@ jobs:
       - name: Add the bin directory to PATH
         run: echo "$HOME/install/bin" >> $GITHUB_PATH
       - name: Check installed version
+        if: always()
         shell: bash -l {0}
         run: source ./.github/workflows/print_versions.sh
       - name: Run tests

.github/workflows/osgeo4w.yml

@@ -66,6 +66,11 @@ jobs:
         shell: msys2 {0}
         run: .github/workflows/build_osgeo4w.sh
 
+      - name: Print installed versions
+        if: always()
+        shell: msys2 {0}
+        run: .github/workflows/print_versions.sh
+
       - name: Test executing of the grass command
         run: .github/workflows/test_simple.bat 'C:\OSGeo4W\opt\grass\grass84.bat'
 

.github/workflows/periodic_update.yml

@@ -28,7 +28,7 @@ jobs:
           wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess && chmod +x config.guess
           wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub && chmod +x config.sub
       # Display changes, only to follow along in the logs.
-      - run: git diff config.guess config.sub
+      - run: git diff -- config.guess config.sub
       - name: Double check if files are modified
         run: git status --ignored
       - name: Create Pull Request

.github/workflows/print_versions.sh

@@ -10,6 +10,6 @@ git --version
 
 # This will fail if the build failed.
 grass --version
-grass --tmp-location XY --exec g.version -e
+grass --tmp-location XY --exec g.version -ergb
 # Detailed Python version info (in one line thanks to echo)
 grass --tmp-location XY --exec bash -c "echo Python: \$(\$GRASS_PYTHON -c 'import sys; print(sys.version)')"

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

@@ -105,7 +105,7 @@ jobs:
           path: bandit.sarif
 
       - name: Upload SARIF File into Security Tab
-        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         with:
           sarif_file: bandit.sarif
 

.github/workflows/super-linter.yml

@@ -31,7 +31,7 @@ jobs:
           # list of files that changed across commits
           fetch-depth: 0
       - name: Lint code base
-        uses: super-linter/super-linter/slim@5b638caee6ba65e25e07143887b669a1233847a0 # v6.5.1
+        uses: super-linter/super-linter/slim@88ea3923a7e1f89dd485d079f6eb5f5e8f937589 # v6.6.0
         env:
           DEFAULT_BRANCH: main
           # To report GitHub Actions status checks

AUTHORS

@@ -407,7 +407,7 @@ Contact
  GRASS Development Team
  c/o Markus Neteler
  mundialis GmbH & Co. KG
- Kölnstrasse 99
+ Koelnstrasse 99
  53111 Bonn, Germany
  neteler AT osgeo.org
 

COPYING

@@ -32,7 +32,7 @@ GRASS Development Team at the following address:
  GRASS Development Team
  c/o Markus Neteler
  mundialis GmbH & Co. KG
- Kölnstrasse 99
+ Koelnstrasse 99
  53111 Bonn, Germany
  neteler AT osgeo.org