Merge pull request #374 from mass-matrix/mm/cov

Use cov module instead of folder path
ATOMScience-org · Oct 1, 2024 · 1116f36 · 1116f36
2 parents 4ab09dc + d0ac7a5
commit 1116f36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -40,7 +40,7 @@ jobs:
       - name: pytest
         run: |
           # python3.9 -m pytest --capture=sys --capture=fd --cov=atomsci/ -vv atomsci/ddm/test/unit
-          cd atomsci/ddm/test/unit && python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci/ -vv
+          cd atomsci/ddm/test/unit && python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv
         env:
           ENV: test
 
@@ -85,7 +85,7 @@ jobs:
       - name: pytest
         run: |
           # TODO: Run this test with pytest for paralell testing
-          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci/ -vv atomsci/ddm/test/integrative
+          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
           cd atomsci/ddm/test/integrative && ./integrative_batch_chunk_tests 0
         env:
           ENV: test
@@ -131,7 +131,7 @@ jobs:
       - name: pytest
         run: |
           # TODO: Run this test with pytest for paralell testing
-          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci/ -vv atomsci/ddm/test/integrative
+          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
           cd atomsci/ddm/test/integrative && ./integrative_batch_chunk_tests 1
         env:
           ENV: test
@@ -177,7 +177,7 @@ jobs:
       - name: pytest
         run: |
           # TODO: Run this test with pytest for paralell testing
-          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci/ -vv atomsci/ddm/test/integrative
+          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
           cd atomsci/ddm/test/integrative && ./integrative_batch_chunk_tests 2
         env:
           ENV: test
@@ -223,7 +223,7 @@ jobs:
       - name: pytest
         run: |
           # TODO: Run this test with pytest for paralell testing
-          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci/ -vv atomsci/ddm/test/integrative
+          # python3.9 -m pytest -n 2 --capture=sys --capture=fd --cov=atomsci -vv atomsci/ddm/test/integrative
           cd atomsci/ddm/test/integrative && ./integrative_batch_chunk_tests 3
         env:
           ENV: test

diff --git a/Makefile b/Makefile
@@ -122,8 +122,8 @@ pytest-integrative:
 
 pytest-unit:
 	@echo "Running unit tests"
-	docker run -v $(shell pwd)/$(WORK_DIR):/$(WORK_DIR) $(IMAGE_REPO):$(PLATFORM)-$(ENV) \
-			/bin/bash -l -c "cd atomsci/ddm/test/unit && python3.9 -m pytest --capture=sys --capture=fd --cov=atomsci/ -vv"
+	docker run -v $(shell pwd)/$(WORK_DIR):/$(WORK_DIR) $(IMAGE_REPO):$(TAG) \
+			/bin/bash -l -c "cd atomsci/ddm/test/unit && python3.9 -m pytest --capture=sys --capture=fd --cov=atomsci -vv"
 
 # Run ruff linter
 ruff:

diff --git a/atomsci/ddm/test/integrative/integrative_batch_chunk_tests b/atomsci/ddm/test/integrative/integrative_batch_chunk_tests
@@ -41,7 +41,7 @@ for folder in "${folders[@]}"; do
         if [[ -f "$file" && "$folder" != "__pycache__/" ]]; then
             cd "$folder"
             echo "Testing $folder"
-            pytest --capture=sys --capture=fd --cov=atomsci/ -vv
+            pytest --capture=sys --capture=fd --cov=atomsci -vv
             cd ..
         else
           echo "Skipping folder: $folder. Not a test directory."