Merge branch 'main' into temporal_only_current_mapset

OSGeo · Feb 14, 2024 · 523d887 · 523d887
2 parents 36eb604 + aaecfc8
commit 523d887
Show file tree

Hide file tree

Showing 477 changed files with 27,625 additions and 9,748 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -5,6 +5,8 @@ docker
 .github
 .travis
 .travis.yml
+# Do not copy files from previous compilations
+dist.*
 
 # The following git files are needed by GRASS GIS to extract the revision
 # during compilation. If you are not using one of the Dockerimages from this

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,160 @@
+---
+libraries:
+  - changed-files:
+      - any-glob-to-any-file:
+          - lib/**
+          - include/grass/**
+          - python/**
+module:
+  - changed-files:
+      - any-glob-to-any-file:
+          - db/**
+          - display/**
+          - general/**
+          - imagery/**
+          - misc/**
+          - ps/**
+          - raster/**
+          - raster3d/**
+          - scripts/**
+          - temporal/**
+          - vector/**
+
+# Module categories
+database:
+  - changed-files:
+      - any-glob-to-any-file:
+          - db/**
+          - lib/db/**
+          - scripts/db.*/**
+          - '**.sql'
+display:
+  - changed-files:
+      - any-glob-to-any-file:
+          - display/**
+          - lib/display/**
+          - scripts/d.*/**
+general:
+  - changed-files:
+      - any-glob-to-any-file:
+          - general/**
+          - scripts/g.*/**
+GUI:
+  - changed-files:
+      - any-glob-to-any-file:
+          - gui/**
+imagery:
+  - changed-files:
+      - any-glob-to-any-file:
+          - imagery/**
+          - lib/imagery/**
+          - scripts/i.*/**
+misc:
+  - changed-files:
+      - any-glob-to-any-file:
+          - misc/**
+          - scripts/m.*/**
+raster:
+  - changed-files:
+      - any-glob-to-any-file:
+          - raster/**
+          - lib/raster/**
+          - scripts/r.*/**
+raster3d:
+  - changed-files:
+      - any-glob-to-any-file:
+          - raster3d/**
+          - lib/raster3d/**
+          - scripts/r3.*/**
+temporal:
+  - changed-files:
+      - any-glob-to-any-file:
+          - temporal/**
+          - lib/temporal/**
+          - scripts/t.*/**
+vector:
+  - changed-files:
+      - any-glob-to-any-file:
+          - vector/**
+          - lib/vector/**
+          - scripts/v.*/**
+
+# Build, packaging, or OS related
+CI:
+  - changed-files:
+      - any-glob-to-any-file:
+          - .github/**
+          - .travis/**
+          - binder/**
+          - .travis.yml
+          - renovate.json
+          - .pre-commit-config.yaml
+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/**
+          - rpm/** 
+docker:
+  - changed-files:
+      - any-glob-to-any-file:
+          - docker/**
+          - '**/*Dockerfile*'
+          - '**/*dockerfile*'
+          - .dockerignore
+
+docs:
+- all:
+  - changed-files:
+      - any-glob-to-any-file:
+          - doc/**
+          - man/**
+          - '**/*.md'
+          - '**/*.rst'
+          - '**/*.html'
+          - '**/*.dox'
+          - '**/*.png'
+          - '**.cff'
+          - CITING
+          - CHANGES
+          - AUTHORS
+          - NEWS
+          - TODO
+      - all-globs-to-all-files:
+          - '!doc/development/rfc/**'
+RFC:
+  - changed-files:
+      - any-glob-to-any-file: 
+          - doc/development/rfc/**
+translation:
+  - changed-files:
+      - any-glob-to-any-file: locale/**
+
+# based on file types
+Python:
+  - changed-files:
+      - any-glob-to-any-file: 
+        - '**/*.py'
+        - '**/pyproject.toml'
+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'
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@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 31
 
@@ -38,7 +38,7 @@ jobs:
           exclude: mswindows .*\.bat .*/testsuite/data/.*
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

diff --git a/.github/workflows/build_ubuntu-22.04.sh b/.github/workflows/build_ubuntu-22.04.sh
@@ -20,8 +20,9 @@ fi
 # an old version of configure, which issues compiler warnings and
 # errors out. This may be removed with upgraded configure.in file.
 makecmd="make"
-if [[ "$#" -eq 2 ]]; then
-    makecmd="make CFLAGS='$CFLAGS $2' CXXFLAGS='$CXXFLAGS $2'"
+if [[ "$#" -ge 2 ]]; then
+    ARGS=("$@")
+    makecmd="make CFLAGS='$CFLAGS ${ARGS[@]:1}' CXXFLAGS='$CXXFLAGS ${ARGS[@]:1}'"
 fi
 
 # non-existent variables as an errors

diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -17,7 +17,7 @@ jobs:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: Run clang-format style check for C/C++/Protobuf programs.
         uses: jidicula/[email protected]
         with:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -16,49 +16,72 @@ on:
     # Check every Saturday at 18:36
     - cron: 36 18 * * 6
 
+permissions: {}
+
 jobs:
   analyze:
-    name: ${{ matrix.language }}
+    name: Analyze
     runs-on: ubuntu-22.04
+    permissions:
+      security-events: write
+      actions: read
+      contents: read
 
     strategy:
       fail-fast: false
       matrix:
-        # C is included in cpp, no separate C language available on CodeQL
         language:
-          - cpp
+          - c-cpp
           - python
 
+    concurrency:
+      group: ${{ github.workflow }}-${{
+        github.event_name == 'pull_request' &&
+        github.head_ref || github.sha }}-${{ matrix.language }}
+      cancel-in-progress: true
+
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          languages: ${{ matrix.language }}
-          config-file: ./.github/codeql/codeql-config.yml
-
-      - name: Get dependencies
+          python-version: '3.x'
+      - name: Install non-Python dependencies
+        if: ${{ matrix.language == 'c-cpp' }}
         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
 
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          config-file: ./.github/codeql/codeql-config.yml
+          setup-python-dependencies: false
+
       - name: Create installation directory
         run: |
-          mkdir $HOME/install
+          mkdir "${HOME}/install"
 
       - name: Set LD_LIBRARY_PATH for compilation
         run: |
-          echo "LD_LIBRARY_PATH=$HOME/install/lib" >> $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=${HOME}/install/lib" >> $GITHUB_ENV
+
+      - name: Set number of cores for compilation
+        run: |
+          echo "MAKEFLAGS=-j$(nproc)" >> $GITHUB_ENV
 
       - name: Build
+        if: ${{ matrix.language == 'c-cpp' }}
         env:
           CFLAGS: -std=gnu11
           CXXFLAGS: -std=c++11
-        run: .github/workflows/build_ubuntu-22.04.sh $HOME/install
+        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
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/create_release_draft.yml b/.github/workflows/create_release_draft.yml
@@ -22,12 +22,12 @@ jobs:
 
     steps:
       - name: Checks-out repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
@@ -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/docker.yml b/.github/workflows/docker.yml
@@ -49,12 +49,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         with:
           fetch-depth: 0
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: osgeo/grass-gis
           tags: |
@@ -66,17 +66,17 @@ jobs:
             latest=false
             suffix=-${{ matrix.os }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN  }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           push: true
           pull: true

diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: Get dependencies
         run: |
           sudo apt-get update -y
@@ -63,4 +63,6 @@ jobs:
           CFLAGS: -std=${{ matrix.c }} -fPIC -Wall -Wextra
           # TODO: -pedantic-errors here won't compile
           CXXFLAGS: -std=${{ matrix.cpp }} -fPIC -Wall -Wextra
-        run: .github/workflows/build_ubuntu-22.04.sh $HOME/install -Werror
+        run: |
+          .github/workflows/build_ubuntu-22.04.sh $HOME/install \
+              -isystem/usr/include/gdal -Wpedantic -Werror