Merge pull request #99 from freifunkMUC/fix_bazel

This fixes bazel coverage

.github/workflows/bazel.yml

@@ -19,17 +19,14 @@ jobs:
           sudo apt-get install -y lcov
           mkdir "${GITHUB_WORKSPACE}/src"
           cd "${GITHUB_WORKSPACE}/src"
-          curl -L https://github.com/ulfjack/coveragepy/archive/lcov-support.tar.gz | tar xvz
+          curl -L https://files.pythonhosted.org/packages/18/a0/bfa6c6ab7a5f0aeb69dd169d956ead54133f5bca68a5945c4569ea2c40b3/coverage-7.1.0.tar.gz | tar xvz
           cd "${GITHUB_WORKSPACE}"
-          bazel coverage --javabase=@bazel_tools//tools/jdk:remote_jdk11 -t- --instrument_test_targets \
+          bazel coverage --combined_report=lcov --javabase=@bazel_tools//tools/jdk:remote_jdk11 -t- --instrument_test_targets \
             --experimental_cc_coverage --test_output=errors --linkopt=--coverage --linkopt=-lc \
-            --test_env=PYTHON_COVERAGE=${GITHUB_WORKSPACE}/src/coveragepy-lcov-support/__main__.py  \
+            --test_env=PYTHON_COVERAGE=${GITHUB_WORKSPACE}/src/coverage-7.1.0/__main__.py  \
             --define=config_file=test ...:all
-          # Combine all generated reports into a single merged coverage.dat
-          lcov  $(find ./bazel-wgkex/ -size +1  -name "*coverage.dat" | sed 's/^/\-a\ /g') -o combined.dat
-          lcov --extract combined.dat '*/__main__/wgkex/*' | sed 's/^SF\:.*__main__\//SF\:/g' > coverage.dat
       - name: Coveralls
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: coverage.dat
+          path-to-lcov: bazel-out/_coverage/_coverage_report.dat

requirements.txt

@@ -6,4 +6,5 @@ Flask
 
 # Common
 ipaddress
-mock
+mock
+coverage