From c3afbdd035596408a040a38355e197c35b712ff9 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 18:58:42 -0600 Subject: [PATCH 01/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4248a0c17..dbf96d36c 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight --omit=OpenOversight/migrations/versions/* --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From 14fc6ed15f21d65893109125d125b074475b000d Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:02:00 -0600 Subject: [PATCH 02/13] Update test_coverage.yml --- .github/workflows/test_coverage.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index e7e72a2c8..8d7c5f76e 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -1,5 +1,8 @@ name: Test Coverage on: + pull_request: + branches: + - develop push: branches: - develop From 8bd165d1bbea6f9d75e09f69834fed3cedbde3d5 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:17:11 -0600 Subject: [PATCH 03/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dbf96d36c..f26bcc694 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight --omit=OpenOversight/migrations/versions/* --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight/app --cov=OpenOversight/tests --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From 3825ae58e5d1804fb970a75a1065a852728c7f97 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:23:09 -0600 Subject: [PATCH 04/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f26bcc694..afc25256c 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight/app --cov=OpenOversight/tests --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight/app --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From 332530137667bda2b0d9be3cae493fa652721ee7 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:27:04 -0600 Subject: [PATCH 05/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index afc25256c..3a3c33cac 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight/app --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight/app/* --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From 091440dd60bf80e96cf9d8eed90ef99704460710 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:32:23 -0600 Subject: [PATCH 06/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3a3c33cac..434daf5fd 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight/app/* --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight/app/ --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From ed8ae934a6cfce44b5a90967b17b9c054a654d4e Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:35:06 -0600 Subject: [PATCH 07/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 434daf5fd..4248a0c17 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight/app/ --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From cfd2b3eef565d09640969194fadb357a865a3e51 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:35:08 -0600 Subject: [PATCH 08/13] Create .coveragerc --- .coveragerc | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 000000000..832638974 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,3 @@ +[run] +omit = + OpenOversight/migrations/versions/* From cd95b87300eba32ef3991d1c6946c0ea50ced5fe Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:35:30 -0600 Subject: [PATCH 09/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4248a0c17..a24a732b3 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight --cov-config=.coveragerc --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From c4a7e5bd4d55ca55100575c18a6028bf9760e428 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:41:04 -0600 Subject: [PATCH 10/13] Update .coveragerc --- .coveragerc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 832638974..6f68c3331 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,3 +1,3 @@ -[run] +[report] omit = OpenOversight/migrations/versions/* From d1f19689c34233a72a2ba66eb2ada2fcf5cba257 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:47:00 -0600 Subject: [PATCH 11/13] Update .coveragerc --- .coveragerc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.coveragerc b/.coveragerc index 6f68c3331..45efc1b16 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,3 +1,2 @@ -[report] -omit = - OpenOversight/migrations/versions/* +[run] +omit = OpenOversight/migrations/versions/* From 8cd1e526afa3bd4a7c3063309c6a61872f397147 Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:48:27 -0600 Subject: [PATCH 12/13] Try again --- .coveragerc | 2 -- Makefile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 45efc1b16..000000000 --- a/.coveragerc +++ /dev/null @@ -1,2 +0,0 @@ -[run] -omit = OpenOversight/migrations/versions/* diff --git a/Makefile b/Makefile index a24a732b3..9e393af9a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight --cov-config=.coveragerc --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight --cov-exclude=OpenOversight/migrations/versions/* --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start From 5425d8afa1eb6f42db74181e43ba9e841ac547ce Mon Sep 17 00:00:00 2001 From: michplunkett <5885605+michplunkett@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:52:58 -0600 Subject: [PATCH 13/13] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9e393af9a..afc25256c 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build_with_version: create_empty_secret .PHONY: test_with_version test_with_version: build_with_version touch OpenOversight/tests/coverage.xml - docker compose run --rm web-test pytest --cov=OpenOversight --cov-exclude=OpenOversight/migrations/versions/* --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ + docker compose run --rm web-test pytest --cov=OpenOversight/app --cov-report xml:OpenOversight/tests/coverage.xml --doctest-modules -n 4 --dist=loadfile -v OpenOversight/tests/ # Run containers .PHONY: start