Merge remote-tracking branch 'upstream/main' into no-terminal-in-desk…

…top-file

.clang-format

@@ -0,0 +1,30 @@
+---
+BasedOnStyle: LLVM
+IndentWidth: 4
+---
+Language: Cpp
+AccessModifierOffset: -4
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: true
+  AcrossComments: true
+  PadOperators: true
+AlignEscapedNewlines: Left
+AllowShortFunctionsOnASingleLine: InlineOnly
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Stroustrup
+ForEachMacros:
+  - DGL_FOREACH_NODE
+  - DGL_FOREACH_EDGE
+  - BOOST_FOREACH
+IfMacros:
+  - SORT_DEBUG
+MacroBlockBegin: GNO_BEGIN
+MacroBlockEnd: GNO_END
+SortIncludes: Never
+---
+Language: ObjC
+---
+Language: JavaScript
+---
+Language: Json

.dockerignore

@@ -1,9 +1,12 @@
 docker
 !docker/testdata
+!docker/alpine/grass_tests.sh
 .gitignore
 .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

.flake8

@@ -1,7 +1,9 @@
 [flake8]
 ignore =
-    E203,  # whitespace before ':' (Black)
-    W503,  # line break before binary operator (Black)
+    # whitespace before ':' (Black)
+    E203,
+    # line break before binary operator (Black)
+    W503,
 
 per-file-ignores =
     # Files and directories which need fixes or specific exceptions
@@ -54,6 +56,7 @@ per-file-ignores =
     gui/wxpython/core/render.py: E722, F841, E501
     gui/wxpython/core/ws.py: F841, E501
     gui/wxpython/core/settings.py: E722
+    gui/wxpython/core/watchdog.py: E402
     gui/wxpython/datacatalog/tree.py: E731, E402, E501
     gui/wxpython/dbmgr/base.py: E501, E722, F841
     gui/wxpython/dbmgr/dialogs.py: E501, F841, E722
@@ -200,7 +203,7 @@ per-file-ignores =
     scripts/v.report/v.report.py: F841, E501
     scripts/db.out.ogr/db.out.ogr.py: F841
     scripts/g.extension/g.extension.py: F841, E722, E501
-    scripts/r.unpack/r.unpack.py: E722, E501
+    scripts/r.unpack/r.unpack.py: E501
     scripts/v.unpack/v.unpack.py: F841, E722, E501
     scripts/v.import/v.import.py: F841, E722, E501
     scripts/db.univar/db.univar.py: E741, E501
@@ -211,7 +214,7 @@ per-file-ignores =
     scripts/r.fillnulls/r.fillnulls.py: E722, E501
     scripts/d.rast.edit/d.rast.edit.py: E722, E501
     scripts/v.what.strds/v.what.strds.py: E722, E501
-    scripts/i.in.spotvgt/i.in.spotvgt.py: E722, E501
+    scripts/i.in.spotvgt/i.in.spotvgt.py: E501
     # Line too long (esp. module interface definitions)
     scripts/*/*.py: E501
     # local variable 'column' is assigned to but never used

.git-blame-ignore-revs

@@ -16,10 +16,25 @@ e9dfbc4eee6fa14af2f0a8a5e1a7c723b34254db
 c08f63b1b604acbba275c144b543c5164bc9f432
 8eaef1f4e6e9497f469cbb7ab91fe03389a6b49b
 f6a73088a9c17b6cce7102c5c3107ab4b41f3b2c
+65cc33c61461eb1c96bdc3ded4046cb4a595d736
+8b4ccfb47f34da4178bb24df5649fdf0f3ff4857
+ec2a8f3659ce91f4f235be2088772afd83e90540
+e97de6b8d42dca65fc7a7cb56152c56ec18b24bd
 # parser: Use #-space-% to allow writing PEP8-compliant Python code (#1287)
 635224115c5ee9c29a9356210c3b03e5511ef6dc
 # Format shell/Bash scripts
 80bcf7a290a6a1249604b2c8a236154f13e25bfa
 a0ccdb551e004a0f68192fb65cfc9be61b2880ed
 # Format YAML in GH workflows (#1367)
 567fa0643d0ab48de590ffbf0e286a288d359312
+# Indent most of C code (#2544)
+40b598233c196df1c08a6222da24f2307841d1c5
+# ClangFormat (#2709-#2715)
+a7a050ce379806297f2d0969ebdcf720a82f651c
+8de925f87be22a5c943f2969a2872a288d72f2f7
+e0fe05696358cd50205279d4129f1d15934fae39
+b5a70ba2c4d3115656baa764ff51a31bd5a8db19
+9da16f1c51d90d88cd0e1d06e7ae368bbab7a15a
+5546e0172d7dad1e3ee248aec3fe00eeebbb3ab3
+1ca8e8643fdf94679e95f2fda1019637e02ec7d2
+cdd84c130cea04b204479e2efdc75c742efc4843

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: https://opencollective.com/grass
+---
+open_collective: grass/contribute

.github/codeql/codeql-config.yml

@@ -1,7 +1,8 @@
-name: "CodeQL config"
+---
+name: CodeQL config
 paths-ignore:
-  - "**/testsuite/**"
-  - "bin.*"
-  - "dist.*"
+  - '**/testsuite/**'
+  - bin.*
+  - dist.*
   - node_modules
   - python/grass/pygrass/tests

.github/workflows/README.md

@@ -4,7 +4,7 @@
 
 Run locally using Docker:
 
-```
+```bash
 docker run --rm -e RUN_LOCAL=true -e VALIDATE_PERL=true -v $PWD:/tmp/lint github/super-linter
 ```
 

.github/workflows/additional_checks.yml

@@ -1,3 +1,4 @@
+---
 name: Additional Checks
 
 # Checks which are not in standardized tools such as custom checks by scripts
@@ -15,14 +16,18 @@ on:
       - main
       - releasebranch_*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   additional-checks:
     name: Additional checks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout repository contents
-        uses: actions/checkout@v2
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
         with:
           fetch-depth: 31
 
@@ -33,9 +38,13 @@ jobs:
           exclude: mswindows .*\.bat .*/testsuite/data/.*
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: '3.10'
+
+      - name: Check that files with the same content are the same
+        run: |
+          diff Dockerfile docker/ubuntu/Dockerfile
 
       - name: Generate core modules with last commit JSON file and test it
         run: |

.github/workflows/apt.txt

@@ -22,7 +22,6 @@ python3-numpy
 python3-pil
 python3-ply
 python3-pyvirtualdisplay
-python3-six
 python3-termcolor
 sqlite3
 zlib1g-dev

.github/workflows/build_osgeo4w.sh

@@ -19,4 +19,4 @@ export SRC=$(pwd)
 export UNITTEST=1
 
 # Build according to OSGeo4W recipe
-${SRC}/mswindows/osgeo4w/build_osgeo4W.sh
+${SRC}/mswindows/osgeo4w/build_osgeo4w.sh

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

@@ -0,0 +1,25 @@
+---
+name: ClangFormat Check
+on:
+  push:
+    branches:
+      - main
+      - releasebranch_*
+  pull_request:
+    branches:
+      - main
+      - releasebranch_*
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+jobs:
+  formatting-check:
+    name: Formatting Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - name: Run clang-format style check for C/C++/Protobuf programs.
+        uses: jidicula/[email protected]
+        with:
+          clang-format-version: '15'
+          check-path: .