diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 7939d29e1..9d0978d30 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -152,12 +152,3 @@ jobs: - name: Run Coverage Tests run: ./test.sh coverage shell: bash - - name: Generate Coverage Report - run: ./test.sh report coverage.stumpy.xml - shell: bash - - name: Upload Coverage Tests Results - uses: codecov/codecov-action@v4 - with: - file: ./coverage.stumpy.xml - verbose: true - token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.gitignore b/.gitignore index 4ba903a59..c1a36735c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,8 @@ LOG* PID .coverage* -coverage.xml -stumpy.coverage.xml +coverage.json +coverage.stumpy.json dask-worker-space stumpy.egg-info build diff --git a/README.rst b/README.rst index b4c8e0bc8..d34b0cc8b 100644 --- a/README.rst +++ b/README.rst @@ -17,8 +17,7 @@ .. |Test Status| image:: https://github.com/stumpy-dev/stumpy/workflows/Tests/badge.svg :target: https://github.com/stumpy-dev/stumpy/actions?query=workflow%3ATests+branch%3Amain :alt: Test Status -.. |Code Coverage| image:: https://codecov.io/gh/stumpy-dev/stumpy/graph/badge.svg?token=u0DooAbGji - :target: https://codecov.io/gh/stumpy-dev/stumpy +.. |Code Coverage| image:: https://img.shields.io/badge/Coverage-100%25-green :alt: Code Coverage .. |RTD Status| image:: https://readthedocs.org/projects/stumpy/badge/?version=latest :target: https://stumpy.readthedocs.io/ diff --git a/test.sh b/test.sh index 06070c7c6..796024489 100755 --- a/test.sh +++ b/test.sh @@ -5,7 +5,6 @@ print_mode="verbose" custom_testfiles=() max_iter=10 site_pkgs=$(python -c 'import site; print(site.getsitepackages()[0])') -fcoveragexml="coverage.stumpy.xml" # Parse command line arguments for var in "$@" do @@ -31,8 +30,6 @@ do custom_testfiles+=("$var") elif [[ $var =~ ^[\-0-9]+$ ]]; then max_iter=$var - elif [[ "$var" == *".xml" ]]; then - fcoveragexml=$var elif [[ "$var" == "links" ]]; then test_mode="links" else @@ -170,14 +167,7 @@ set_ray_coveragerc() show_coverage_report() { set_ray_coveragerc - coverage report -m --fail-under=100 --skip-covered --omit=fastmath.py,docstring.py,min_versions.py,ray_python_version.py $fcoveragerc -} - -gen_coverage_xml_report() -{ - # This function saves the coverage report in Cobertura XML format, which is compatible with codecov - set_ray_coveragerc - coverage xml -o $fcoveragexml --fail-under=100 --omit=fastmath.py,docstring.py,min_versions.py,ray_python_version.py $fcoveragerc + coverage report --show-missing --fail-under=100 --skip-covered --omit=fastmath.py,docstring.py,min_versions.py,ray_python_version.py $fcoveragerc } test_custom() @@ -384,7 +374,7 @@ elif [[ $test_mode == "report" ]]; then echo "Generate Coverage Report Only" # Assume coverage tests have already been executed # and a coverage file exists - gen_coverage_xml_report + show_coverage_report elif [[ $test_mode == "gpu" ]]; then echo "Executing GPU Unit Tests Only" test_gpu