From 427519a3ebfd875f8ae7c230d82c8d3d81a76d2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Tue, 24 Sep 2024 01:56:28 +0000
Subject: [PATCH 1/5] pytest: Collect code coverage in multiple workers too

---
 .github/workflows/pytest.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index 8e3b2286b1c..2c734774ff5 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -84,7 +84,10 @@ jobs:
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
           export LD_LIBRARY_PATH=$(grass --config path)/lib:$LD_LIBRARY_PATH
           pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
-            --numprocesses auto -ra . \
+            --numprocesses auto \
+            --cov \
+            --cov-context=test \
+            -ra . \
             -m 'not needs_solo_run'
 
       - name: Run pytest with a single worker (for tests marked with needs_solo_run)
@@ -95,6 +98,7 @@ jobs:
           INITIAL_PWD="${PWD}" pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
             --cov \
             --cov-context=test \
+            --cov-append \
             -ra . \
             -m 'needs_solo_run'
       - name: Fix non-standard installed script paths in coverage data

From d150ffe6e40e94557565ef9b302d207fa84f878c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sun, 29 Sep 2024 16:05:56 +0000
Subject: [PATCH 2/5] utils: Handle paths that already have a .py extension in
 coverage_mapper

---
 utils/coverage_mapper.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils/coverage_mapper.py b/utils/coverage_mapper.py
index 9a2f1389781..88fa30f9b54 100644
--- a/utils/coverage_mapper.py
+++ b/utils/coverage_mapper.py
@@ -22,12 +22,14 @@ def map_scripts_paths(old_path):
     if INITIAL_GISBASE is None or INITIAL_PWD is None:
         return old_path
     p = Path(old_path)
+    extension = ".py"
+    p_name = p.stem if p.suffix == extension else p.name
     temporal_base = Path(INITIAL_GISBASE) / "scripts" / "t.*"
     base = Path(INITIAL_GISBASE) / "scripts" / "*"
     if p.match(str(temporal_base)):
-        return str(Path(INITIAL_PWD) / "temporal" / (p.name) / (p.name)) + ".py"
+        return str(Path(INITIAL_PWD) / "temporal" / (p_name) / (p_name)) + extension
     if p.match(str(base)):
-        return str(Path(INITIAL_PWD) / "scripts" / (p.name) / (p.name)) + ".py"
+        return str(Path(INITIAL_PWD) / "scripts" / (p_name) / (p_name)) + extension
 
     return old_path
 

From f894d61aa92ea4cd7516ee4328c895fcc276a904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sat, 5 Oct 2024 13:47:11 +0000
Subject: [PATCH 3/5] CI: Set INITIAL_GISBASE and INITIAL_PWD env vars for
 running pytest with multiple workers

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

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
index ccceefb92a8..8dfd0b69317 100644
--- a/.github/workflows/pytest.yml
+++ b/.github/workflows/pytest.yml
@@ -83,6 +83,8 @@ jobs:
         run: |
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
           export LD_LIBRARY_PATH=$(grass --config path)/lib:$LD_LIBRARY_PATH
+          export INITIAL_GISBASE="$(grass --config path)"
+          export INITIAL_PWD="${PWD}"
           pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
             --numprocesses auto \
             --cov \
@@ -95,7 +97,8 @@ jobs:
           export PYTHONPATH=`grass --config python_path`:$PYTHONPATH
           export LD_LIBRARY_PATH=$(grass --config path)/lib:$LD_LIBRARY_PATH
           export INITIAL_GISBASE="$(grass --config path)"
-          INITIAL_PWD="${PWD}" pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
+          export INITIAL_PWD="${PWD}"
+          pytest --verbose --color=yes --durations=0 --durations-min=0.5 \
             --cov \
             --cov-context=test \
             --cov-append \

From 6b3947c014179337d5813751b3d41beefa6a70f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sat, 5 Oct 2024 14:24:56 +0000
Subject: [PATCH 4/5] Coverage: Omit gui/wxpython subfolders for now

They are not covered at all and take some noticeable time to collect
---
 .coveragerc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.coveragerc b/.coveragerc
index 65e13c2234b..d6c910a628a 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -9,6 +9,8 @@ omit =
     ${INITIAL_PWD-.}/.github/*
     ${INITIAL_PWD-.}/bin.*/*
     ${INITIAL_PWD-.}/dist.*/*
+    ${INITIAL_PWD-.}/gui/wxpython/*/**
+    **/gui/wxpython/*/**
     **/OBJ.*/*
 source =
     .

From cf088a11fb1a8674735f55d299c11221db30acf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sat, 5 Oct 2024 15:05:08 +0000
Subject: [PATCH 5/5] Coverage: Remove unneeded omit patten for gui/wxpython
 subfolders

---
 .coveragerc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.coveragerc b/.coveragerc
index d6c910a628a..409fde55643 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -9,7 +9,6 @@ omit =
     ${INITIAL_PWD-.}/.github/*
     ${INITIAL_PWD-.}/bin.*/*
     ${INITIAL_PWD-.}/dist.*/*
-    ${INITIAL_PWD-.}/gui/wxpython/*/**
     **/gui/wxpython/*/**
     **/OBJ.*/*
 source =