diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index edc56ce6..2d04cb11 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,11 +36,9 @@ jobs: - name: Install dependencies run: | pip install -r requirements-dev.txt - pip install tox - name: Run tests and collect coverage run: | - make gen-protos - coverage run -m pytest tests + make test coverage xml - name: Coverage diff --git a/.gitignore b/.gitignore index 2f7aff65..86113b25 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,7 @@ dist/ *pb2_grpc.py *.pyi -libs/ \ No newline at end of file +libs/ + +# Ignore coverage file +coverage.xml \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4a9adfce..6a248c18 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: hooks: - id: mypy additional_dependencies: [tokenize-rt==3.2.0] -- repo: git@github.com:humitos/mirrors-autoflake.git +- repo: https://github.com/humitos/mirrors-autoflake rev: v1.1 hooks: - id: autoflake diff --git a/requirements-dev.txt b/requirements-dev.txt index 1e92dae0..c39027a7 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,3 +4,4 @@ mock==4.0.3 pre-commit==2.15.0 pytest==6.2.5 requirements-tools==1.2.4 +tox==3.24.5 diff --git a/tox.ini b/tox.ini index 2593dcd1..dfa046b6 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,7 @@ commands = coverage run -m pytest -s {posargs:tests} coverage report --show-missing coverage html + coverage xml pre-commit install -f --install-hooks pre-commit run --all-files # check-requirements