From a93d2b1356a64678b5e27920008df5dab2ffe49c Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Tue, 21 Nov 2023 11:32:53 +0100
Subject: [PATCH 1/8] Update INSTALL.md

---
 INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL.md b/INSTALL.md
index 4a595b41065..ab582970612 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,7 +2,7 @@
 
 Please read _all_ text below.
 
-## Table of contents
+## Table of contents   
 
 - PREREQUISITES
 - (A) SOURCE CODE DISTRIBUTION

From 01c0cf973f68f3d5d9438b89e5bc2696147a67fd Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 10:34:58 +0000
Subject: [PATCH 2/8] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 Dockerfile                                          | 2 +-
 INSTALL.md                                          | 2 +-
 doc/notebooks/hydrology.ipynb                       | 2 +-
 doc/notebooks/jupyter_example.ipynb                 | 2 +-
 doc/notebooks/jupyter_tutorial.ipynb                | 2 +-
 doc/notebooks/parallelization_tutorial.ipynb        | 2 +-
 doc/notebooks/scripting_example.ipynb               | 2 +-
 doc/notebooks/solar_potential.ipynb                 | 2 +-
 doc/notebooks/temporal.ipynb                        | 2 +-
 doc/notebooks/viewshed_analysis.ipynb               | 2 +-
 docker/ubuntu/Dockerfile                            | 2 +-
 locale/transifex/.tx/config                         | 1 -
 locale/transifex/transifex_merge_2.sh               | 6 +++---
 raster/r.mfilter/graphics_for_description.ipynb     | 2 +-
 raster/r.neighbors/graphics_for_description.ipynb   | 2 +-
 raster/r.series/graphics_for_description.ipynb      | 2 +-
 raster/r.stats.zonal/graphics_for_description.ipynb | 2 +-
 scripts/v.dissolve/v_dissolve.ipynb                 | 2 +-
 vector/v.fill.holes/examples.ipynb                  | 2 +-
 19 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c6a5113f33..42544cbc7a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.6
 
 # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
-#       Changes to this file must be copied over to the other file.  
+#       Changes to this file must be copied over to the other file.
 
 ARG GUI=without
 
diff --git a/INSTALL.md b/INSTALL.md
index ab582970612..4a595b41065 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,7 +2,7 @@
 
 Please read _all_ text below.
 
-## Table of contents   
+## Table of contents
 
 - PREREQUISITES
 - (A) SOURCE CODE DISTRIBUTION
diff --git a/doc/notebooks/hydrology.ipynb b/doc/notebooks/hydrology.ipynb
index f19ce35c436..87009e569e3 100644
--- a/doc/notebooks/hydrology.ipynb
+++ b/doc/notebooks/hydrology.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/doc/notebooks/jupyter_example.ipynb b/doc/notebooks/jupyter_example.ipynb
index a0f660b5cd3..0b06e2f4f2d 100644
--- a/doc/notebooks/jupyter_example.ipynb
+++ b/doc/notebooks/jupyter_example.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/doc/notebooks/jupyter_tutorial.ipynb b/doc/notebooks/jupyter_tutorial.ipynb
index 194ec0e7083..2d2a946415b 100644
--- a/doc/notebooks/jupyter_tutorial.ipynb
+++ b/doc/notebooks/jupyter_tutorial.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/doc/notebooks/parallelization_tutorial.ipynb b/doc/notebooks/parallelization_tutorial.ipynb
index 35a49fa2766..268beca08aa 100644
--- a/doc/notebooks/parallelization_tutorial.ipynb
+++ b/doc/notebooks/parallelization_tutorial.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/doc/notebooks/scripting_example.ipynb b/doc/notebooks/scripting_example.ipynb
index 612904da115..5429c01ebf8 100644
--- a/doc/notebooks/scripting_example.ipynb
+++ b/doc/notebooks/scripting_example.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/doc/notebooks/solar_potential.ipynb b/doc/notebooks/solar_potential.ipynb
index cb3fd985910..99b1dc8f17a 100644
--- a/doc/notebooks/solar_potential.ipynb
+++ b/doc/notebooks/solar_potential.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "id": "33082a70-1d2d-4bfa-bc45-981115829941",
diff --git a/doc/notebooks/temporal.ipynb b/doc/notebooks/temporal.ipynb
index 9a4433dc7fa..cf689bef3c1 100644
--- a/doc/notebooks/temporal.ipynb
+++ b/doc/notebooks/temporal.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/doc/notebooks/viewshed_analysis.ipynb b/doc/notebooks/viewshed_analysis.ipynb
index 263931ba25c..3f04d865928 100644
--- a/doc/notebooks/viewshed_analysis.ipynb
+++ b/doc/notebooks/viewshed_analysis.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
index 9c6a5113f33..42544cbc7a3 100644
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.6
 
 # Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
-#       Changes to this file must be copied over to the other file.  
+#       Changes to this file must be copied over to the other file.
 
 ARG GUI=without
 
diff --git a/locale/transifex/.tx/config b/locale/transifex/.tx/config
index 4415ef7e651..09cacf91c82 100644
--- a/locale/transifex/.tx/config
+++ b/locale/transifex/.tx/config
@@ -18,4 +18,3 @@ source_file = ../templates/grasswxpy.pot
 source_lang = en
 file_filter = ../po/grasswxpy_<lang>.po
 type        = PO
-
diff --git a/locale/transifex/transifex_merge_2.sh b/locale/transifex/transifex_merge_2.sh
index df8813e51cd..14c6eb44a00 100755
--- a/locale/transifex/transifex_merge_2.sh
+++ b/locale/transifex/transifex_merge_2.sh
@@ -7,7 +7,7 @@
 
 # Required installation:
 #  sudo pip3 install transifex-client
-# see also: https://grasswiki.osgeo.org/wiki/GRASS_messages_translation#Get_the_translated_po_files 
+# see also: https://grasswiki.osgeo.org/wiki/GRASS_messages_translation#Get_the_translated_po_files
 
 # Usage:
 # this script has to be launched in the `locale/` directory.
@@ -40,12 +40,12 @@ for fil in `ls $NEWLIBPODIR`;
 do
   # TODO: keep uppercase for pt_BR etc - rename in SVN as needed
   MYLANG=`echo $fil | sed 's+_translation++g'`
-  
+
   # LV is not translated in Tx thus skip it
   if [[ ${MYLANG} == "lv" ]]; then
     continue
   fi
-  
+
   # https://www.gnu.org/software/gettext/manual/html_node/msgmerge-Invocation.html#msgmerge-Invocation
   # if po file locally present, update it, otherwise copy over new file from transifex
   if [ -f grasslibs_${MYLANG}.po ]; then
diff --git a/raster/r.mfilter/graphics_for_description.ipynb b/raster/r.mfilter/graphics_for_description.ipynb
index 91942544c04..7c9981d4e99 100644
--- a/raster/r.mfilter/graphics_for_description.ipynb
+++ b/raster/r.mfilter/graphics_for_description.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/raster/r.neighbors/graphics_for_description.ipynb b/raster/r.neighbors/graphics_for_description.ipynb
index 62c36112726..e14b0ba5488 100644
--- a/raster/r.neighbors/graphics_for_description.ipynb
+++ b/raster/r.neighbors/graphics_for_description.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/raster/r.series/graphics_for_description.ipynb b/raster/r.series/graphics_for_description.ipynb
index adb2f2c1483..36893c9b1b4 100644
--- a/raster/r.series/graphics_for_description.ipynb
+++ b/raster/r.series/graphics_for_description.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/raster/r.stats.zonal/graphics_for_description.ipynb b/raster/r.stats.zonal/graphics_for_description.ipynb
index 38b0f4c2a1a..da0ec87a36c 100644
--- a/raster/r.stats.zonal/graphics_for_description.ipynb
+++ b/raster/r.stats.zonal/graphics_for_description.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/scripts/v.dissolve/v_dissolve.ipynb b/scripts/v.dissolve/v_dissolve.ipynb
index f90907a704d..828d97cdb60 100644
--- a/scripts/v.dissolve/v_dissolve.ipynb
+++ b/scripts/v.dissolve/v_dissolve.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},
diff --git a/vector/v.fill.holes/examples.ipynb b/vector/v.fill.holes/examples.ipynb
index 28d86332b0a..5111e5274d0 100644
--- a/vector/v.fill.holes/examples.ipynb
+++ b/vector/v.fill.holes/examples.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

From 4ff4c1032ef9db3209d9a24875aa42be43857754 Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Tue, 21 Nov 2023 11:39:53 +0100
Subject: [PATCH 3/8] min-space-is-1

---
 .pre-commit-config.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f70c0a55f9e..20c358665eb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -69,4 +69,6 @@ repos:
     hooks:
       - id: yamllint
         args: [--format, parsable, --strict, -d,
-               '{extends: default, rules: {truthy: disable, line-length: {max: 120, allow-non-breakable-words: true}}}']
+               '{extends: default, rules: {truthy: disable,
+                 line-length: {max: 120, allow-non-breakable-words: true},
+                 comments: {min-spaces-from-content: 1}}}']

From 466bfed0379bda51833f859f9bf784e65f1feefe Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Tue, 21 Nov 2023 11:44:46 +0100
Subject: [PATCH 4/8] multiline

---
 .github/workflows/python-code-quality.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
index 39775cbdbdc..090d211be8e 100644
--- a/.github/workflows/python-code-quality.yml
+++ b/.github/workflows/python-code-quality.yml
@@ -114,7 +114,10 @@ jobs:
       - name: Run Pylint on other files using pytest
         run: |
           pip install pytest pytest-pylint==0.19
-          echo "::warning file=.github/workflows/python-code-quality.yml,line=116,col=42,endColumn=48::Temporarily downgraded pytest-pylint to allow merging other PRs. The errors reported with a newer version seem legitimite and should be fixed (2023-10-18, see https://github.com/OSGeo/grass/pull/3205)"
+          echo "::warning file=.github/workflows/python-code-quality.yml,line=116,col=42,endColumn=48::Temporarily\
+            downgraded pytest-pylint to allow merging other PRs. The errors reported\
+            with a newer version seem legitimite and should be fixed (2023-10-18,\
+            see https://github.com/OSGeo/grass/pull/3205)"
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
           export LD_LIBRARY_PATH=$HOME/install/grass84/lib:$LD_LIBRARY_PATH
           pytest --pylint -m pylint --pylint-rcfile=.pylintrc --pylint-jobs=$(nproc) \

From af92be3faf0c5ebe2b2e8c81ff200a503b882fb8 Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Tue, 21 Nov 2023 12:05:33 +0100
Subject: [PATCH 5/8] revert temporal.ipynb

---
 doc/notebooks/temporal.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/notebooks/temporal.ipynb b/doc/notebooks/temporal.ipynb
index cf689bef3c1..1882daf27a3 100644
--- a/doc/notebooks/temporal.ipynb
+++ b/doc/notebooks/temporal.ipynb
@@ -1,5 +1,5 @@
 {
-    "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

From b028671179eaff1385af773dde9667577053a617 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 11:07:19 +0000
Subject: [PATCH 6/8] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 doc/notebooks/temporal.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/notebooks/temporal.ipynb b/doc/notebooks/temporal.ipynb
index 1882daf27a3..cf689bef3c1 100644
--- a/doc/notebooks/temporal.ipynb
+++ b/doc/notebooks/temporal.ipynb
@@ -1,5 +1,5 @@
 {
-  "cells": [
+    "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

From e52cc193f0104fd5469a41c0e44c4194f82d0267 Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Tue, 21 Nov 2023 12:16:50 +0100
Subject: [PATCH 7/8] exclude *.ipynb files

---
 .pre-commit-config.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 20c358665eb..61509b4280b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -62,7 +62,8 @@ repos:
         types_or: [c, c++, javascript, json, objective-c]
         exclude: |
           (?x)^(
-                man/jquery.fixedheadertable.min.js
+                man/jquery.fixedheadertable.min.js$|
+                .*\.ipynb$
           )
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.29.0

From 2bb9ec631a3bd2656babafbbbd290314dd8a298b Mon Sep 17 00:00:00 2001
From: Nicklas Larsson <n_larsson@yahoo.com>
Date: Tue, 21 Nov 2023 12:24:45 +0100
Subject: [PATCH 8/8] Update temporal.ipynb back again

---
 doc/notebooks/temporal.ipynb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/notebooks/temporal.ipynb b/doc/notebooks/temporal.ipynb
index cf689bef3c1..1882daf27a3 100644
--- a/doc/notebooks/temporal.ipynb
+++ b/doc/notebooks/temporal.ipynb
@@ -1,5 +1,5 @@
 {
-    "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},