From fc96cd8a8c1c94644902fe96f7c56290394abaaa Mon Sep 17 00:00:00 2001 From: guillemdb Date: Sun, 16 Oct 2022 22:33:15 +0200 Subject: [PATCH 1/2] Update requirements Signed-off-by: guillemdb --- requirements-test.txt | 2 +- src/mloq/assets/project/requirements-test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index b45aa16a..c34c39ca 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,6 @@ psutil==5.8.0 pytest==6.2.5 -pytest-cov==3.0.0 +pytest-cov==4.0.0 pytest-xdist==2.4.0 pytest-rerunfailures==10.2 hypothesis==6.24.6 \ No newline at end of file diff --git a/src/mloq/assets/project/requirements-test.txt b/src/mloq/assets/project/requirements-test.txt index b45aa16a..c34c39ca 100644 --- a/src/mloq/assets/project/requirements-test.txt +++ b/src/mloq/assets/project/requirements-test.txt @@ -1,6 +1,6 @@ psutil==5.8.0 pytest==6.2.5 -pytest-cov==3.0.0 +pytest-cov==4.0.0 pytest-xdist==2.4.0 pytest-rerunfailures==10.2 hypothesis==6.24.6 \ No newline at end of file From 026164104cd2d6dc986ef4fff376dae59bb9f39e Mon Sep 17 00:00:00 2001 From: guillemdb Date: Sun, 16 Oct 2022 22:35:44 +0200 Subject: [PATCH 2/2] Update codecov config Signed-off-by: guillemdb --- .codecov.yml | 2 +- Makefile | 2 +- pyproject.toml | 2 +- src/mloq/assets/project/.codecov.yml | 2 +- src/mloq/assets/shared/Makefile | 2 +- src/mloq/assets/shared/pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index 41777de6..c72c1b4a 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -16,4 +16,4 @@ coverage: threshold: 0% informational: true paths: - - ^src/mloq.* + - src/mloq diff --git a/Makefile b/Makefile index eae78ab2..d7b6e67f 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ test: .PHONY: test-codecov test-codecov: find -name "*.pyc" -delete - pytest -n $n -s -o log_cli=true -o log_cli_level=info --cov=. --cov-report=xml --cov-config=pyproject.toml + pytest -n $n -s -o log_cli=true -o log_cli_level=info --cov=./src/mloq --cov-report=xml --cov-config=pyproject.toml .PHONY: docker-shell docker-shell: diff --git a/pyproject.toml b/pyproject.toml index 74c2ef5f..21c038b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,7 @@ honor_noqa = true # Code coverage config [tool.coverage.run] branch = true -# source = ["src/mloq"] +source = ["src/mloq"] [tool.coverage.report] exclude_lines =["no cover", diff --git a/src/mloq/assets/project/.codecov.yml b/src/mloq/assets/project/.codecov.yml index 41777de6..d9f8fee7 100644 --- a/src/mloq/assets/project/.codecov.yml +++ b/src/mloq/assets/project/.codecov.yml @@ -16,4 +16,4 @@ coverage: threshold: 0% informational: true paths: - - ^src/mloq.* + - src/{{ project.project_name }} diff --git a/src/mloq/assets/shared/Makefile b/src/mloq/assets/shared/Makefile index 5d537303..8e9d4331 100644 --- a/src/mloq/assets/shared/Makefile +++ b/src/mloq/assets/shared/Makefile @@ -26,7 +26,7 @@ test: .PHONY: test-codecov test-codecov: find -name "*.pyc" -delete - pytest -n $n -s -o log_cli=true -o log_cli_level=info --cov=. --cov-report=xml --cov-config=pyproject.toml{% endif %} + pytest -n $n -s -o log_cli=true -o log_cli_level=info --cov=./src/{{project.project_name}} --cov-report=xml --cov-config=pyproject.toml{% endif %} {% if docker.makefile %} .PHONY: docker-shell docker-shell: diff --git a/src/mloq/assets/shared/pyproject.toml b/src/mloq/assets/shared/pyproject.toml index 3c93d983..49ceaaf3 100644 --- a/src/mloq/assets/shared/pyproject.toml +++ b/src/mloq/assets/shared/pyproject.toml @@ -69,7 +69,7 @@ build-backend = "setuptools.build_meta" # Code coverage config [tool.coverage.run] branch = true -# source = ["src/{{lint.project_name}}"] +source = ["src/{{lint.project_name}}"] [tool.coverage.report] exclude_lines =["no cover",