Merge branch 'main' into periodic/update-configure

a0x8o · Sep 5, 2024 · e026b1d · e026b1d
2 parents 2907ec2 + 752e0c4
commit e026b1d
Show file tree

Hide file tree

Showing 1,304 changed files with 130,925 additions and 1,701 deletions.
diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
@@ -42,6 +42,9 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> main
       RUFF_VERSION: "0.5.1"
 =======
       RUFF_VERSION: "0.5.4"
@@ -58,6 +61,7 @@ jobs:
 =======
       RUFF_VERSION: "0.6.3"
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> eeb0e02953 (CI(deps): Update ruff to v0.6.3 (#4252))
 =======
       RUFF_VERSION: "0.6.3"
@@ -69,6 +73,9 @@ jobs:
 >>>>>>> eeb0e02953 (CI(deps): Update ruff to v0.6.3 (#4252))
 >>>>>>> add90c6c62 (CI(deps): Update ruff to v0.6.3 (#4252))
 >>>>>>> 9d4b175651 (CI(deps): Update ruff to v0.6.3 (#4252))
+=======
+>>>>>>> osgeo-main
+>>>>>>> main
 
     runs-on: ${{ matrix.os }}
     permissions:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -43,6 +43,9 @@ repos:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> main
     rev: v0.5.1
 =======
     rev: v0.5.4
@@ -59,6 +62,7 @@ repos:
 =======
     rev: v0.6.3
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> eeb0e02953 (CI(deps): Update ruff to v0.6.3 (#4252))
 =======
     rev: v0.6.3
@@ -70,6 +74,9 @@ repos:
 >>>>>>> eeb0e02953 (CI(deps): Update ruff to v0.6.3 (#4252))
 >>>>>>> add90c6c62 (CI(deps): Update ruff to v0.6.3 (#4252))
 >>>>>>> 9d4b175651 (CI(deps): Update ruff to v0.6.3 (#4252))
+=======
+>>>>>>> osgeo-main
+>>>>>>> main
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/CHANGES b/CHANGES
@@ -30,6 +30,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fe7bbc01f5 (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
@@ -39,6 +40,8 @@
 =======
 >>>>>>> main
 =======
+>>>>>>> main
+=======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
@@ -72,6 +75,7 @@
 >>>>>>> osgeo-main
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
@@ -94,6 +98,9 @@
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+>>>>>>> main
 CHANGES in GRASS GIS 8.x
 =======
 CHANGES in GRASS GIS 8.x compared to GRASS GIS 7.x
@@ -134,6 +141,9 @@ List of releases:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> main
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -345,9 +355,13 @@ List of releases:
 >>>>>>> osgeo-main
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> e78917837c (Programmer's manual: update GRASS GIS arch drawing (#1610))
 =======
 >>>>>>> 5cd58fa15c (Programmer's manual: update GRASS GIS arch drawing (#1610))
+=======
+>>>>>>> osgeo-main
+>>>>>>> main
 CHANGES in GRASS GIS 8.x
 =======
 CHANGES in GRASS GIS 8.x compared to GRASS GIS 7.x
@@ -406,6 +420,7 @@ List of releases:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -426,6 +441,7 @@ List of releases:
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> osgeo-main
 =======
+<<<<<<< HEAD
 =======
 >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -490,6 +506,11 @@ List of releases:
 =======
 >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> f22e713aab (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+=======
+>>>>>>> main
 CHANGES in GRASS GIS 8.x
 
 https://trac.osgeo.org/grass/wiki/Grass8/NewFeatures80
@@ -502,7 +523,10 @@ List of releases:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 8dce6e5f7e (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> main
 <<<<<<< HEAD
 >>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
 =======
@@ -518,6 +542,7 @@ List of releases:
 >>>>>>> osgeo-main
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
 <<<<<<< HEAD
 >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
@@ -576,6 +601,9 @@ List of releases:
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+>>>>>>> main
 - GitHub list: https://github.com/OSGeo/grass/releases
 - Overview list: https://trac.osgeo.org/grass/wiki/Release
 - History: https://grass.osgeo.org/home/history/releases/ (starting 1984!)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -140,9 +140,12 @@ You can use your favorite tools to change source code or other files
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
 =======
+>>>>>>> main
+=======
 <<<<<<< HEAD
 =======
 >>>>>>> osgeo-main
@@ -179,6 +182,7 @@ You can use your favorite tools to change source code or other files
 >>>>>>> osgeo-main
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
@@ -201,6 +205,9 @@ You can use your favorite tools to change source code or other files
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+>>>>>>> main
 in the local copy of the code. When making changes, please follow the
 [Programming Style Guide](./doc/development/style_guide.md).
 
@@ -238,9 +245,12 @@ to your code.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
 =======
+>>>>>>> main
+=======
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
@@ -278,6 +288,7 @@ to your code.
 >>>>>>> osgeo-main
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> bc7152a288 (wxpyimgview: explicit conversion to int (#2704))
 =======
 =======
@@ -308,6 +319,11 @@ to your code.
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
+=======
+=======
+>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
+>>>>>>> osgeo-main
+>>>>>>> main
 in the local copy of the code. When making changes, please follow
 Submitting Guidelines at
 <http://trac.osgeo.org/grass/wiki/Submitting>.
@@ -364,6 +380,9 @@ to your code.
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> main
 =======
 <<<<<<< HEAD
 >>>>>>> main
@@ -508,6 +527,7 @@ to your code.
 >>>>>>> osgeo-main
 =======
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
 =======
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
@@ -518,6 +538,9 @@ to your code.
 >>>>>>> b5acd78515 (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> adc008a3ff (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 29af9b668b (wxpyimgview: explicit conversion to int (#2704))
+=======
+>>>>>>> osgeo-main
+>>>>>>> main
 
 ### Committing