CI: make things work with coverage.py 5.x

It has changed its internal format to sqlite and still doesn't
provide a way to merge runs from different OSes, see
nedbat/coveragepy#903

.gitlab-ci/coverage-docker.sh

@@ -5,7 +5,8 @@ set -e
 python -m pip install coverage
 
 # Make the Windows paths match our current layout
-python ./.gitlab-ci/fixup-cov-paths.py coverage/.coverage* coverage/*.lcov
+python ./.gitlab-ci/fixup-lcov-paths.py coverage/*.lcov
+python ./.gitlab-ci/fixup-covpy-paths.py coverage/.coverage*
 
 # Remove external headers (except gi tests)
 for path in coverage/*.lcov; do

.gitlab-ci/fixup-covpy-paths.py

@@ -0,0 +1,17 @@
+import sys
+import sqlite3
+
+
+def main(argv):
+    paths = argv[1:]
+
+    for path in paths:
+        # https://github.com/nedbat/coveragepy/issues/903
+        conn = sqlite3.connect(path)
+        conn.execute("UPDATE file set path = REPLACE(path, '\\', '/')")
+        conn.commit()
+        conn.close()
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

.gitlab-ci/test-msys2.sh

@@ -31,9 +31,6 @@ pacman --noconfirm -S --needed \
     git \
     perl
 
-# https://github.com/Alexpux/MINGW-packages/issues/4333
-pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-$PYTHON-pathlib2
-
 # ccache setup
 export PATH="$MSYSTEM/lib/ccache/bin:$PATH"
 mkdir -p _ccache

setup.cfg

@@ -4,6 +4,7 @@ exclude=subprojects
 
 [coverage:run]
 branch=True
+relative_files=True
 include=
     gi/*
     tests/*