Merge branch 'osgeo-main'

.coveragerc

@@ -9,6 +9,7 @@ omit =
     ${INITIAL_PWD-.}/.github/*
     ${INITIAL_PWD-.}/bin.*/*
     ${INITIAL_PWD-.}/dist.*/*
+    **/gui/wxpython/*/**
     **/OBJ.*/*
 source =
     .

.flake8

@@ -20,61 +20,10 @@ 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
-    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
-    man/build_class.py: F403, F405
-    man/build_class_rest.py: F403, F405
-    man/build_check.py: F403, F405
-    man/build_full_index.py: F403, F405
-    man/build_index.py: F403, F405
-    man/build_index_rest.py: F403, F405
-    man/build_keywords.py: F403, F405, E722
-    man/build_topics.py: F403, F405, E722
     man/build_html.py: E501
-    imagery/i.atcorr/create_iwave.py: F632, F821, W293
-    doc/python/raster_example_ctypes.py: F403, F405
-    doc/python/vector_example_ctypes.py: F403, F405
-    doc/python/m.distance.py: F403, F405, E501
-    doc/gui/wxpython/example/dialogs.py: F401
-    locale/grass_po_stats.py: E122, E128, E231, E401, E722
+    doc/python/m.distance.py: E501
     gui/scripts/d.wms.py: E501
-    gui/wxpython/core/gcmd.py: E402
-    gui/wxpython/core/gthread.py: F841
-    gui/wxpython/core/gconsole.py: E722
-    gui/wxpython/core/toolboxes.py: E722
-    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
-    gui/wxpython/core/settings.py: E722
-    gui/wxpython/core/watchdog.py: E402
-    gui/wxpython/datacatalog/tree.py: E731, E402
-    gui/wxpython/dbmgr/base.py: E722
-    gui/wxpython/dbmgr/dialogs.py: E722
-    gui/wxpython/dbmgr/sqlbuilder.py: E722
-    gui/wxpython/dbmgr/manager.py: E722
-    gui/wxpython/docs/wxgui_sphinx/conf.py: E402, W291
-    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
-    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
-    gui/wxpython/gui_core/preferences.py: E266, F841
-    gui/wxpython/gui_core/treeview.py: F841
-    gui/wxpython/gui_core/widgets.py: F841, E722, E266
-    gui/wxpython/image2target/*: F841, E722, E265
-    gui/wxpython/image2target/g.gui.image2target.py: E501, E265, F841
-    gui/wxpython/iscatt/*: F841, E722, F405, F403
-    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/image2target/g.gui.image2target.py: E501
     gui/wxpython/modules/*: F841, E722
     gui/wxpython/nviz/*: F841, E266, E722, F403, F405
     gui/wxpython/photo2image/*: F841, E722, E265
@@ -84,8 +33,6 @@ per-file-ignores =
     gui/wxpython/vnet/*: F841
     gui/wxpython/wxgui.py: F841
     gui/wxpython/animation/g.gui.animation.py: E501
-    gui/wxpython/animation/mapwindow.py: F841
-    gui/wxpython/animation/provider.py: F841
     gui/wxpython/tplot/frame.py: F841, E722
     gui/wxpython/tplot/g.gui.tplot.py: E501
     gui/wxpython/rdigit/g.gui.rdigit.py: F841
@@ -153,33 +100,28 @@ per-file-ignores =
     python/grass/*/*/__init__.py: F401, F403
     python/grass/*/*/*/__init__.py: F401, F403
     # E402 module level import not at top of file
-    scripts/d.polar/d.polar.py: F841
-    scripts/r.in.wms/wms_gdal_drv.py: F841, E722
-    scripts/r.in.wms/wms_cap_parsers.py: F841
+    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: F841, E501
-    scripts/v.report/v.report.py: F841, E721
+    scripts/r.semantic.label/r.semantic.label.py: E501
+    scripts/v.report/v.report.py: E721
     scripts/db.out.ogr/db.out.ogr.py: F841
     scripts/g.extension/g.extension.py: F841, E722, E501
-    scripts/v.unpack/v.unpack.py: F841, E722, E501
-    scripts/v.import/v.import.py: F841, E722, E501
+    scripts/v.unpack/v.unpack.py: E722, E501
+    scripts/v.import/v.import.py: E722, E501
     scripts/db.univar/db.univar.py: E501
     scripts/d.frame/d.frame.py: E722
     scripts/i.pansharpen/i.pansharpen.py: E722, E501
     scripts/r.in.srtm/r.in.srtm.py: E722
     scripts/r.fillnulls/r.fillnulls.py: E722
     scripts/d.rast.edit/d.rast.edit.py: E722
-    scripts/v.what.strds/v.what.strds.py: E722, E501
+    scripts/v.what.strds/v.what.strds.py: E501
     # Line too long (esp. module interface definitions)
     scripts/*/*.py: E501
-    # local variable 'column' is assigned to but never used
     temporal/t.rast.to.vect/t.rast.to.vect.py: E501
-    # local variable 'stdstype' is assigned to but never used
-    temporal/t.vect.algebra/t.vect.algebra.py: F841, E501
+    temporal/t.vect.algebra/t.vect.algebra.py: E501
     # ## used (##% key: r etc)
-    # local variable 'map_list' is assigned to but never used
-    temporal/t.rast.what/t.rast.what.py: E265, E266, F841, E501
+    temporal/t.rast.what/t.rast.what.py: E265, E266, E501
     # Line too long (esp. module interface definitions)
     temporal/*/*.py: E501
 

.github/actions/create-upload-suggestions/action.yml

@@ -177,7 +177,7 @@ runs:
         echo "diff-file-name=${INPUT_DIFF_FILE_NAME}" >> "${GITHUB_OUTPUT}"
       env:
         INPUT_DIFF_FILE_NAME: ${{ steps.tool-name-safe.outputs.diff-file-name }}
-    - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       id: upload-diff
       if: >-
         ${{ (steps.files_changed.outputs.files_changed == 'true') &&
@@ -200,7 +200,7 @@ runs:
           echo 'Suggestions can only be added near to lines changed in this PR.'
           echo 'If any fixes can be added as code suggestions, they will be added shortly from another workflow.'
         } >> "${GITHUB_STEP_SUMMARY}"
-    - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+    - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
       id: upload-changes
       if: >-
         ${{ always() &&

.github/labeler.yml

@@ -123,9 +123,7 @@ docs:
               - '**/*.png'
               - '**.cff'
               - CITING
-              - CHANGES
               - AUTHORS
-              - NEWS
               - TODO
           - all-globs-to-all-files:
               - '!doc/development/rfc/**'

.github/workflows/additional_checks.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository contents
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 31
 

.github/workflows/apt.txt

@@ -7,8 +7,8 @@ libfftw3-dev
 libgdal-dev
 libgl1-mesa-dev
 libglu1-mesa-dev
+liblapacke-dev
 libnetcdf-dev
-libopenblas-dev
 libpdal-dev
 libpng-dev
 libproj-dev

.github/workflows/clang-format-check.yml

@@ -16,7 +16,7 @@ jobs:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           persist-credentials: false
       - uses: DoozyX/clang-format-lint-action@c71d0bf4e21876ebec3e5647491186f8797fde31 # v0.18.2

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Set up Python
         uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
         with:
@@ -52,11 +52,11 @@ jobs:
           sudo apt-get install -y wget git gawk findutils
           xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
               sudo apt-get install -y --no-install-recommends --no-install-suggests
-      - uses: rui314/setup-mold@0bf4f07ef9048ec62a45f9dbf2f098afa49695f0 # v1
+      - uses: rui314/setup-mold@b015f7e3f2938ad3a5ed6e5111a8c6c7c1d6db6e # v1
         if: ${{ matrix.language == 'c-cpp' }}
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/coverity.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-22.04
     if: github.repository == 'OSGeo/grass'
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       - name: Get dependencies
         run: |

.github/workflows/create_release_draft.yml

@@ -30,7 +30,7 @@ jobs:
       contents: write
     steps:
       - name: Checks-out repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0

.github/workflows/docker.yml

@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           fetch-depth: 0
       - name: Docker meta
@@ -73,11 +73,15 @@ jobs:
 =======
         uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
       - name: Set up Docker Buildx
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.5.0
 >>>>>>> main
 =======
         uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
+>>>>>>> osgeo-main
+=======
+        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
 >>>>>>> osgeo-main
       - name: Login to DockerHub
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -88,6 +92,7 @@ jobs:
         id: docker_build
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
 =======
@@ -98,6 +103,9 @@ jobs:
 >>>>>>> osgeo-main
 =======
         uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
+>>>>>>> osgeo-main
+=======
+        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
 >>>>>>> osgeo-main
         with:
           push: true

.github/workflows/gcc.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - name: Get dependencies
         run: |
           sudo apt-get update -y

.github/workflows/macos.yml

@@ -44,13 +44,20 @@ jobs:
             -mindepth 1 -maxdepth 1 -type f -print -delete
           # Rehash to forget about the deleted files
           hash -r
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - name: Get current date cache key segment
+        id: date
+        # Year and week of year so cache key changes weekly
+        run: echo "date=$(date +%Y-%U)" >> "${GITHUB_OUTPUT}"
       - name: Setup Mamba
-        uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822 # v1.9.0
+        uses: mamba-org/setup-micromamba@617811f69075e3fd3ae68ca64220ad065877f246 # v2.0.0
         with:
           init-shell: bash
           environment-file: .github/workflows/macos_dependencies.txt
           environment-name: grass-env
+          # Persist on the same period (date).
+          cache-environment-key: environment-${{ steps.date.outputs.date }}
+
       - name: Environment info
         shell: bash -el {0}
         run: |
@@ -59,17 +66,17 @@ jobs:
       - name: Create installation directory
         run: mkdir $HOME/install
       - name: Build and install
-        shell: bash -l {0}
+        shell: micromamba-shell {0}
         run: source ./.github/workflows/macos_install.sh $HOME/install
       - name: Add the bin directory to PATH
         run: echo "$HOME/install/bin" >> $GITHUB_PATH
       - name: Check installed version
         if: ${{ !cancelled() }}
-        shell: bash -l {0}
+        shell: micromamba-shell {0}
         run: source ./.github/workflows/print_versions.sh
 
       - name: Run pytest with multiple workers in parallel
-        shell: bash -el {0}
+        shell: micromamba-shell {0}
         run: |
           export PYTHONPATH=$(grass --config python_path):$PYTHONPATH
           export LD_LIBRARY_PATH=$(grass --config path)/lib:$LD_LIBRARY_PATH
@@ -78,7 +85,7 @@ jobs:
             -ra . \
             -m 'not needs_solo_run'
       - name: Run pytest with a single worker (for tests marked with needs_solo_run)
-        shell: bash -el {0}
+        shell: micromamba-shell {0}
         run: |
           export PYTHONPATH=$(grass --config python_path):$PYTHONPATH
           export LD_LIBRARY_PATH=$(grass --config path)/lib:$LD_LIBRARY_PATH
@@ -87,7 +94,7 @@ jobs:
             -m 'needs_solo_run'
 
       - name: Run gunittest tests
-        shell: bash -el {0}
+        shell: micromamba-shell {0}
         run: |
           grass --tmp-project XY --exec \
               g.download.project url=${{ env.SampleData }} path=$HOME
@@ -100,7 +107,7 @@ jobs:
                        nc_spm_full_v2alpha2.tar.gz"
       - name: Make HTML test report available
         if: ${{ !cancelled() }}
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: testreport-macOS
           path: testreport

.github/workflows/macos_dependencies.txt

@@ -1,4 +1,3 @@
-blas
 cairo
 clangxx_osx-arm64
 clang_osx-arm64
@@ -13,7 +12,6 @@ giflib
 git
 ipython
 krb5
-lapack
 lastools
 libgdal-arrow-parquet
 libgdal-core
@@ -32,6 +30,7 @@ libtiff
 llvm-openmp
 matplotlib
 numpy<2
+openblas
 pandoc
 pdal
 pillow

.github/workflows/macos_gunittest.cfg

@@ -6,25 +6,18 @@
 exclude =
     gui/wxpython/core/testsuite/test_gcmd.py
     gui/wxpython/core/testsuite/toolboxes.sh
-    lib/init/testsuite/test_grass_tmp_mapset.py
-    python/grass/gunittest/testsuite/test_assertions_rast3d.py
     python/grass/gunittest/testsuite/test_assertions_vect.py
-    python/grass/gunittest/testsuite/test_gmodules.py
-    python/grass/gunittest/testsuite/test_gunitest_doctests.py
     python/grass/pygrass/raster/testsuite/test_pygrass_raster_doctests.py
     python/grass/pygrass/rpc/testsuite/test_pygrass_rpc_doctests.py
-    python/grass/script/testsuite/test_script_doctests.py
     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
     raster/r.in.pdal/testsuite/test_r_in_pdal_binning.py
     raster/r.in.pdal/testsuite/test_r_in_pdal_selection.py
-    raster/r.terraflow/testsuite/test_r_terraflow.py
     raster/r.sun/testsuite/test_rsun.py
     raster3d/r3.flow/testsuite/r3flow_test.py
-    scripts/g.search.modules/testsuite/test_g_search_modules.py
-    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