Merge branch 'main' into r.horizon-fix-test_low_res

OSGeo · Jan 5, 2024 · 65eb96b · 65eb96b
2 parents 2efdb66 + 53c362d
commit 65eb96b
Show file tree

Hide file tree

Showing 109 changed files with 11,356 additions and 4,741 deletions.
diff --git a/.flake8 b/.flake8
@@ -50,6 +50,7 @@ per-file-ignores =
     gui/wxpython/core/giface.py: E501
     gui/wxpython/core/gthread.py: F841
     gui/wxpython/core/gconsole.py: E722, W605
+    gui/wxpython/core/globalvar.py: W605
     gui/wxpython/core/toolboxes.py: E722, E501
     gui/wxpython/core/utils.py: E722, F841, W605
     gui/wxpython/core/workspace.py: E722, E501

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -0,0 +1,88 @@
+---
+libraries:
+  - changed-files:
+      - any-glob-to-any-file:
+          - lib/**/*
+          - include/grass/*
+          - include/grass/**/*
+          - python/**/*
+module:
+  - changed-files:
+      - any-glob-to-any-file:
+          - db/**/*
+          - display/**/*
+          - general/**/*
+          - imagery/**/*
+          - misc/**/*
+          - ps/**/*
+          - raster/**/*
+          - raster3d/**/*
+          - scripts/**/*
+          - temporal/**/*
+          - vector/**/*
+vector:
+  - changed-files:
+      - any-glob-to-any-file: vector/**/*
+raster:
+  - changed-files:
+      - any-glob-to-any-file: raster/**/*
+temporal:
+  - changed-files:
+      - any-glob-to-any-file: temporal/**/*
+database:
+  - changed-files:
+      - any-glob-to-any-file: db/**/*
+GUI:
+  - changed-files:
+      - any-glob-to-any-file: gui/**/*
+Windows:
+  - changed-files:
+      - any-glob-to-any-file: mswindows/**/*
+macOS:
+  - changed-files:
+      - any-glob-to-any-file: macosx/**/*
+Linux:
+  - changed-files:
+      - any-glob-to-any-file: singularity/**/*
+docker:
+  - changed-files:
+      - any-glob-to-any-file: docker/**/*
+docs:
+  - changed-files:
+      - any-glob-to-any-file:
+          - doc/**/*
+          - man/**/*
+RFC:
+  - changed-files:
+      - any-glob-to-any-file: doc/development/rfc/*
+translation:
+  - changed-files:
+      - any-glob-to-any-file: locale/**/*
+CI:
+  - changed-files:
+      - any-glob-to-any-file:
+          - .github/**/*
+          - .travis/**/*
+
+# based on file types
+Python:
+  - changed-files:
+      - any-glob-to-any-file: '**/*.py'
+C:
+  - changed-files:
+      - any-glob-to-any-file: '**/*.c'
+C++:
+  - changed-files:
+      - any-glob-to-any-file: '**/*.cpp'
+CSS:
+  - changed-files:
+      - any-glob-to-any-file: '**/*.css'
+HTML:
+  - changed-files:
+      - any-glob-to-any-file: '**/*.html'
+JavaScript:
+  - changed-files:
+      - any-glob-to-any-file: '**/*.js'
+Markdown:
+  - changed-files:
+      - any-glob-to-any-file: '**/*.md'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -61,4 +61,4 @@ jobs:
         run: .github/workflows/build_ubuntu-22.04.sh $HOME/install
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/create_release_draft.yml b/.github/workflows/create_release_draft.yml
@@ -93,7 +93,7 @@ jobs:
           asset_content_type: application/gzip
 
       - name: Make the created files available
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: artifacts

diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -0,0 +1,25 @@
+---
+name: Pull Request Labeler
+
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler/blob/master/README.md
+
+on:
+  - pull_request_target
+
+permissions: {}
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v5
+        with:
+          sync-labels: true
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -80,7 +80,7 @@ jobs:
                        nc_spm_full_v2alpha2.tar.gz"
       - name: Make HTML test report available
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: testreport-macOS
           path: testreport

diff --git a/.github/workflows/macos_gunittest.cfg b/.github/workflows/macos_gunittest.cfg
@@ -16,7 +16,6 @@ exclude =
     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.contour/testsuite/testrc.py
     raster/r.in.gdal/testsuite/test_r_in_gdal.py
     raster/r.in.lidar/testsuite/test_base_resolution.sh
     raster/r.in.lidar/testsuite/test_base_resolution.sh

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -25,6 +25,7 @@ jobs:
         python-version:
           - '3.8'
           - '3.10'
+          - '3.12'
       fail-fast: true
 
     runs-on: ${{ matrix.os }}
@@ -79,3 +80,11 @@ jobs:
       - name: Print installed versions
         if: always()
         run: .github/workflows/print_versions.sh
+  pytest-success:
+    name: pytest Result
+    needs:
+      - pytest
+    if: ${{ always() }}
+    uses: ./.github/workflows/verify-success.yml
+    with:
+      needs_context: ${{ toJson(needs) }}
diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
@@ -13,11 +13,12 @@ on:
 
 jobs:
   python-checks:
-    name: Python Code Quality
+    name: Python Code Quality Checks
 
     concurrency:
-      group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
-        matrix.pylint-version }}
+      group: ${{ github.workflow }}-${{ github.job }}-${{
+        github.event_name == 'pull_request' &&
+        github.head_ref || github.sha }}-${{ matrix.pylint-version }}
       cancel-in-progress: true
 
     # Using matrix just to get variables which are not environmental variables
@@ -26,11 +27,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            python-version: '3.10'
-            min-python-version: '3.7'
-            black-version: '23.1.0'
-            flake8-version: '3.9.2'
-            pylint-version: '2.12.2'
+            python-version: "3.10"
+            min-python-version: "3.7"
+            black-version: "23.1.0"
+            flake8-version: "3.9.2"
+            pylint-version: "2.12.2"
 
     runs-on: ${{ matrix.os }}
 
@@ -39,7 +40,7 @@ jobs:
         run: |
           echo OS: ${{ matrix.os }}
           echo Python: ${{ matrix.python-version }}
-          echo Minimimal Python version: ${{ matrix.min-python-version }}
+          echo Minimal Python version: ${{ matrix.min-python-version }}
           echo Black: ${{ matrix.black-version }}
           echo Flake8: ${{ matrix.flake8-version }}
           echo Pylint: ${{ matrix.pylint-version }}
@@ -50,13 +51,14 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: pip
 
       - name: Install non-Python dependencies
         run: |
           sudo apt-get update -y
           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
+          sudo apt-get install -y --no-install-recommends --no-install-suggests
 
       - name: Install Python dependencies
         run: |
@@ -141,8 +143,16 @@ jobs:
           cp -rp dist.$ARCH/docs/html/libpython sphinx-grass
 
       - name: Make Sphinx documentation available
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sphinx-grass
           path: sphinx-grass
           retention-days: 3
+  python-success:
+    name: Python Code Quality Result
+    needs:
+      - python-checks
+    if: ${{ always() }}
+    uses: ./.github/workflows/verify-success.yml
+    with:
+      needs_context: ${{ toJson(needs) }}
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -14,7 +14,7 @@ on:
       - releasebranch_*
 
 jobs:
-  build-and-test:
+  ubuntu:
     name: ${{ matrix.name }} tests
 
     concurrency:
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: '22.04'
+          - name: "22.04"
             os: ubuntu-22.04
             config: ubuntu-22.04
           # This is without optional things but it still keeps things useful,
@@ -86,7 +86,7 @@ jobs:
 
       - name: Make HTML test report available
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: testreport-${{ matrix.config }}
           path: testreport
@@ -95,3 +95,11 @@ jobs:
       - name: Print installed versions
         if: always()
         run: .github/workflows/print_versions.sh
+  build-and-test-success:
+    name: Build & Test Result
+    needs:
+      - ubuntu
+    if: ${{ always() }}
+    uses: ./.github/workflows/verify-success.yml
+    with:
+      needs_context: ${{ toJson(needs) }}