Merge branch 'main' into i_svm

OSGeo · Jan 3, 2024 · 61f6722 · 61f6722
2 parents b8363ac + e4431cc
commit 61f6722
Show file tree

Hide file tree

Showing 314 changed files with 12,328 additions and 6,183 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/additional_checks.yml b/.github/workflows/additional_checks.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository contents
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 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@8ade135a41bc03ea155e62e844d188df1ea18608 # 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
@@ -31,10 +31,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+        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
@@ -22,12 +22,12 @@ jobs:
 
     steps:
       - name: Checks-out repository
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 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,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
         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@8ade135a41bc03ea155e62e844d188df1ea18608 # 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
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
@@ -22,9 +22,9 @@ jobs:
     name: macOS build
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - name: Setup Mambaforge
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           channels: conda-forge
           miniforge-variant: Mambaforge
@@ -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_install.sh b/.github/workflows/macos_install.sh
@@ -66,12 +66,13 @@ CONFIGURE_FLAGS="\
   --with-readline-libs=${CONDA_PREFIX}/lib
 "
 
-export CFLAGS="-O2 -pipe -arch ${CONDA_ARCH} -DGL_SILENCE_DEPRECATION -Wall -Wextra"
-export CXXFLAGS="-O2 -pipe -stdlib=libc++ -arch ${CONDA_ARCH} -Wall -Wextra"
+export CFLAGS="-O2 -pipe -arch ${CONDA_ARCH} -DGL_SILENCE_DEPRECATION -Wall -Wextra -Wpedantic"
+export CXXFLAGS="-O2 -pipe -stdlib=libc++ -arch ${CONDA_ARCH} -Wall -Wextra -Wpedantic"
+export CPPFLAGS="-isystem${CONDA_PREFIX}/include"
 
 ./configure $CONFIGURE_FLAGS
 
-EXEMPT="-Wno-error=deprecated-non-prototype"
+EXEMPT="-Wno-error=deprecated-non-prototype -Wno-error=strict-prototypes"
 make -j$(sysctl -n hw.ncpu) CFLAGS="$CFLAGS -Werror $EXEMPT" \
   CXXFLAGS="$CXXFLAGS -Werror $EXEMPT"
 

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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
       - uses: msys2/setup-msys2@v2
         with:
           path-type: inherit

diff --git a/.github/workflows/periodic_update.yml b/.github/workflows/periodic_update.yml
@@ -0,0 +1,51 @@
+---
+name: Periodic update
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API, or on a schedule.
+on:
+  workflow_dispatch:
+  schedule:
+    # At 10:32 on every first Wednesday of the month.
+    # See https://crontab.guru/#32_10_*/100,1-7_*_WED
+    - cron: "32 10 */100,1-7 * WED"
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  update-configure:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - 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
+      - name: "Check that autoconf scripts are up-to-date:"
+        run: |
+          rm -f config.guess config.sub
+          wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
+          wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+      # Display changes, only to follow along in the logs.
+      - run: git diff config.guess config.sub
+      - name: Double check if files are modified
+        run: git status --ignored
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38  # v5.0.2
+        with:
+          commit-message: "config.guess + config.sub: updated from http://git.savannah.gnu.org/cgit/config.git/plain/"
+          branch: periodic/update-configure
+          title: "configure: update to latest config.guess and config.sub"
+          body: |
+            This updates config.guess and config.sub to their latest versions.
+            If the two files are deleted in this PR, please check the logs of the workflow here:
+            [Workflow run summary](${{ steps.vars.outputs.run-url }})
+
+            Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
+      - name: Check outputs
+        if: ${{ steps.cpr.outputs.pull-request-number }}
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -25,17 +25,19 @@ jobs:
         python-version:
           - '3.8'
           - '3.10'
+          - '3.12'
       fail-fast: true
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: pip
 
       - name: Install non-Python dependencies
         run: |
@@ -49,7 +51,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r .github/workflows/python_requirements.txt
           pip install -r .github/workflows/optional_requirements.txt
-          pip install pytest pytest-timeout
+          pip install pytest pytest-timeout pytest-github-actions-annotate-failures pytest-xdist
 
       - name: Create installation directory
         run: |
@@ -73,7 +75,7 @@ jobs:
         run: |
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
           export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
-          pytest .
+          pytest --numprocesses auto .
 
       - name: Print installed versions
         if: always()