diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-12-20 16:48:00 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-12-27 16:14:43 +0100 |
| commit | fb3644c40b7a28255eaf3048b3560cb3c31ebf3c (patch) | |
| tree | f8a2a4d6ddc6e6685fa6dcdddfb80a357efc010a | |
| parent | 7263d940b731660d06648d9d510cdc270c731aaa (diff) | |
| download | pygobject-fb3644c40b7a28255eaf3048b3560cb3c31ebf3c.tar.gz | |
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
https://github.com/nedbat/coveragepy/issues/903
| -rwxr-xr-x | .gitlab-ci/coverage-docker.sh | 3 | ||||
| -rw-r--r-- | .gitlab-ci/fixup-covpy-paths.py | 17 | ||||
| -rw-r--r-- | .gitlab-ci/fixup-lcov-paths.py (renamed from .gitlab-ci/fixup-cov-paths.py) | 0 | ||||
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 3 | ||||
| -rw-r--r-- | setup.cfg | 1 |
5 files changed, 20 insertions, 4 deletions
diff --git a/.gitlab-ci/coverage-docker.sh b/.gitlab-ci/coverage-docker.sh index 2a51d036..9b3e12ea 100755 --- a/.gitlab-ci/coverage-docker.sh +++ b/.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 diff --git a/.gitlab-ci/fixup-covpy-paths.py b/.gitlab-ci/fixup-covpy-paths.py new file mode 100644 index 00000000..3efdc5a6 --- /dev/null +++ b/.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)) diff --git a/.gitlab-ci/fixup-cov-paths.py b/.gitlab-ci/fixup-lcov-paths.py index a6f43e44..a6f43e44 100644 --- a/.gitlab-ci/fixup-cov-paths.py +++ b/.gitlab-ci/fixup-lcov-paths.py diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index 9f3d8759..38d4fbc1 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.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 @@ -4,6 +4,7 @@ exclude=subprojects [coverage:run] branch=True +relative_files=True include= gi/* tests/* |