Merge branch 'main' into fix_wxgui_web_service_xy_loc

OSGeo · Apr 26, 2024 · 0e3a21e · 0e3a21e
2 parents eff9058 + 8cbe8fe
commit 0e3a21e
Show file tree

Hide file tree

Showing 356 changed files with 1,985 additions and 1,151 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,36 +7,35 @@ assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+## Describe the bug
+<!-- A clear and concise description of what the bug is. -->
 
-**To Reproduce**
-Steps to reproduce the behavior:
+## To reproduce
+<!-- Describe the steps to reproduce the behavior, e.g.:
 
 1. Go to '...'
 2. Click on '...'
 3. Compute '...'
 4. See error
+-->
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+## Expected behavior
+<!-- If not obvious, describe what you expected to happen. -->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**System description (please complete the following information):**
+## Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
 
+## System description
+<!--
 - Operating System: [e.g. Windows, Linux, ..., incl. version]
-- GRASS GIS version [e.g. 7.8.4]
-
-<!---
+- GRASS GIS version: [e.g. 4.0]
 
 - details about further software components
     - run `g.version -rge` in a GRASS GIS terminal session or check in
       the GUI menu "Help > About"
     - run `python3 -c "import sys, wx; print(sys.version); print(wx.version())"`
       to print the Python and wxPython version numbers
---->
+-->
 
-**Additional context**
-Add any other context about the problem here.
+## Additional context
+<!-- Add any other context about the problem. -->
diff --git a/.github/actions/create-upload-suggestions/action.yml b/.github/actions/create-upload-suggestions/action.yml
@@ -176,7 +176,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@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+    - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       id: upload-diff
       if: >-
         ${{ (steps.files_changed.outputs.files_changed == 'true') &&
@@ -199,7 +199,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@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+    - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       id: upload-changes
       if: >-
         ${{ always() &&

diff --git a/.github/workflows/additional_checks.yml b/.github/workflows/additional_checks.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository contents
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           fetch-depth: 31
 

diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -16,7 +16,7 @@ jobs:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           persist-credentials: false
       - uses: DoozyX/clang-format-lint-action@11b773b1598aa4ae3b32f023701bca5201c3817d # v0.17

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Set up Python
         uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
@@ -56,7 +56,7 @@ jobs:
               sudo apt-get install -y --no-install-recommends --no-install-suggests
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
+        uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         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@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
+        uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-22.04
     if: github.repository == 'OSGeo/grass'
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
 
       - name: Get dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y wget git gawk findutils jq
+          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
 
@@ -33,7 +33,7 @@ jobs:
       - name: Download Coverity Build Tool
         run: |
           wget -q https://scan.coverity.com/download/cxx/linux64 \
-            --post-data "token=$TOKEN&project=grass" -O cov-analysis-linux64.tar.gz
+            --post-data "token=${TOKEN}&project=grass" -O cov-analysis-linux64.tar.gz
           mkdir cov-analysis-linux64
           tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
         env:
@@ -84,49 +84,29 @@ jobs:
       - name: Build with cov-build
         run: |
           pwd
-          export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
+          export PATH="$(pwd)/cov-analysis-linux64/bin:${PATH}"
           cov-build --dir cov-int make
 
       - name: Put results into Tarball
         run: |
           tar czvf grass.tgz cov-int
 
-      - name: Upload Artifact of Scan Results
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        with:
-          name: grass.tgz
-          path: grass.tgz
-
-      - name: Initialize Build in Coverity Cloud
+      - name: Submit to Coverity Scan
         run: |
-          curl -X POST \
-          -d version="main" \
-          -d description="$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short HEAD)" \
-          -d email=$EMAIL \
-          -d token=$TOKEN \
-          -d file_name="grass.tgz" \
-          https://scan.coverity.com/projects/1038/builds/init \
-          | tee response
+          version=$(head -n 3 include/VERSION | xargs | sed 's/ /./g')
+          commit=$(git rev-parse --short HEAD)
+          branch=$(git rev-parse --abbrev-ref HEAD)
+          desc="Version:${version}, commit:${commit}, branch:${branch}."
+          echo "Submitting ${desc}"
+          desc_url_enc=$(echo "$desc" | sed 's/:/%3A/g' | sed 's/,/%2C/g' | sed 's/ /%20/g')
+          tar czvf grass.tgz cov-int
+          curl \
+            --form "token=${TOKEN}" \
+            --form "email=${EMAIL}" \
+            --form "[email protected]" \
+            --form "version=${version}-${commit}" \
+            --form "description=${desc_url_enc}" \
+            'https://scan.coverity.com/builds?project=grass'
         env:
           TOKEN: ${{ secrets.COVERITY_PASSPHRASE }}
           EMAIL: ${{ secrets.COVERITY_USER }}
-
-      - name: Save Upload URL and Build ID from Initialization Response
-        run: |
-          echo "UPLOAD_URL=$(jq -r '.url' response)" >> $GITHUB_ENV
-          echo "BUILD_ID=$(jq -r '.build_id' response)" >> $GITHUB_ENV
-
-      - name: Upload the tarball to the Cloud
-        run: |
-          export COV_RES_PATH="$(pwd)/grass.tgz"
-          curl -X PUT \
-            --header 'Content-Type: application/json' \
-            --upload-file $COV_RES_PATH \
-            $UPLOAD_URL
-      - name: Trigger the build on Scan
-        run: |
-          curl -X PUT \
-          -d token=$TOKEN \
-          https://scan.coverity.com/projects/1038/builds/$BUILD_ID/enqueue
-        env:
-          TOKEN: ${{ secrets.COVERITY_PASSPHRASE }}
diff --git a/.github/workflows/create_release_draft.yml b/.github/workflows/create_release_draft.yml
@@ -28,7 +28,7 @@ jobs:
       contents: write
     steps:
       - name: Checks-out repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           ref: ${{ github.ref }}
           fetch-depth: 0

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           fetch-depth: 0
       - name: Docker meta

diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Get dependencies
         run: |
           sudo apt-get update -y

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -38,7 +38,7 @@ jobs:
           /usr/bin/sudo /usr/bin/find /usr/local /opt/homebrew -mindepth 1 -maxdepth 1 \
             -type f -print -delete
           hash -r
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Setup Mamba
         uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 # v1.8.1
         with:
@@ -74,7 +74,7 @@ jobs:
                        nc_spm_full_v2alpha2.tar.gz"
       - name: Make HTML test report available
         if: ${{ always() }}
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: testreport-macOS
           path: testreport

diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
@@ -32,7 +32,7 @@ jobs:
         run: |
           git config --global core.autocrlf false
           git config --global core.eol lf
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: msys2/setup-msys2@cc11e9188b693c2b100158c3322424c4cc1dadea # v2.22.0
         with:
           path-type: inherit

diff --git a/.github/workflows/periodic_update.yml b/.github/workflows/periodic_update.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Create URL to the run output
         id: vars
         run: echo "run-url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> $GITHUB_OUTPUT
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: "Check that autoconf scripts are up-to-date:"
         run: |
           rm -f config.guess config.sub
@@ -33,7 +33,7 @@ jobs:
         run: git status --ignored
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2
+        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5
         with:
           commit-message: "config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/"
           branch: periodic/update-configure

diff --git a/.github/workflows/post-pr-reviews.yml b/.github/workflows/post-pr-reviews.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Create a .git directory needed by reviewdog
         run: git init
-      - uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
+      - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
         id: diff
         continue-on-error: true
         with:

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
 
       - name: Set up Python
         uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0

diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
@@ -29,7 +29,7 @@ jobs:
           - os: ubuntu-22.04
             python-version: "3.10"
             min-python-version: "3.7"
-            black-version: "23.1.0"
+            black-version: "24.4.0"
             flake8-version: "3.9.2"
             pylint-version: "2.12.2"
             bandit-version: "1.7.8"
@@ -49,7 +49,7 @@ jobs:
           echo Pylint: ${{ matrix.pylint-version }}
           echo Bandit: ${{matrix.bandit-version}}
 
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
 
       - name: Set up Python
         uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
@@ -60,7 +60,7 @@ jobs:
         run: python -m pip install --upgrade pip
 
       - name: Install Black only
-        run: pip install black==${{ matrix.black-version }}
+        run: pip install black[jupyter]==${{ matrix.black-version }}
 
       - name: Run Black
         run: black .
@@ -102,13 +102,13 @@ jobs:
           bandit -c pyproject.toml -iii -r . -f sarif -o bandit.sarif --exit-zero
 
       - name: Upload Bandit Scan Results
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: bandit.sarif
           path: bandit.sarif
 
       - name: Upload SARIF File into Security Tab
-        uses: github/codeql-action/upload-sarif@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
+        uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         with:
           sarif_file: bandit.sarif
 
@@ -175,7 +175,7 @@ jobs:
           cp -rp dist.$ARCH/docs/html/libpython sphinx-grass
 
       - name: Make Sphinx documentation available
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: sphinx-grass
           path: sphinx-grass

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -28,13 +28,13 @@ jobs:
       statuses: write
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           # super-linter needs the full git history to get the
           # list of files that changed across commits
           fetch-depth: 0
       - name: Lint code base
-        uses: super-linter/super-linter/slim@92e2606383320f72e6129f8a50d8537cf9c84ed6 # v6.3.1
+        uses: super-linter/super-linter/slim@4758be622215d0954c8353ee4877ffd60111cf8e # v6.4.1
         env:
           DEFAULT_BRANCH: main
           # To report GitHub Actions status checks

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -61,7 +61,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
 
       - name: Invert inclusion list to an exclusion list
         id: get-exclude
@@ -151,7 +151,7 @@ jobs:
 
       - name: Make HTML test report available
         if: ${{ always() }}
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: testreport-${{ matrix.os }}-${{ matrix.config }}-${{ matrix.extra-include }}
           path: testreport

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -39,10 +39,11 @@ repos:
     rev: v0.33.0
     hooks:
       - id: markdownlint
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
+  # Using this mirror lets us use mypyc-compiled black, which is about 2x faster
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.4.0
     hooks:
-      - id: black
+      - id: black-jupyter
         exclude: |
           (?x)^(
                 python/libgrass_interface_generator/