moved test folder, added coverage config, added coverage report uploa…

…d step in workflow
JonatanRasmussen · Jan 15, 2024 · 17d6cb0 · 17d6cb0
1 parent 390dde5
commit 17d6cb0
Show file tree

Hide file tree

Showing 58 changed files with 22 additions and 7 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,9 @@
+[run]
+omit =
+    *__init__*
+    */tests/*
+
+[html]
+omit =
+    *__init__*
+    */tests/*
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -17,6 +17,12 @@ jobs:
         pip install -r requirements.txt
     - name: Test with pytest
       run: |
-        pip install pytest coverage
-        coverage run -m pytest project_winegrape_src_files/tests/
-        coverage report -m
+        coverage run -m pytest tests/
+        coverage html --title="DTU 02476 Group 100 Project Coverage Report"
+    - name: Upload pytest test results
+      uses: actions/upload-artifact@v4
+      with:
+        name: coverage-report
+        path: htmlcov/
+      # Use always() to always run this step to publish test results when there are test failures
+      if: ${{ always() }}
diff --git a/project_winegrape_src_files/conf/test_config.yaml b/project_winegrape_src_files/conf/test_config.yaml
@@ -2,7 +2,7 @@ reproducibility:
   seed: 123
 
 data:
-  dir: "project_winegrape_src_files/tests/test_data/raw/grapevine-leaves-image-dataset/Grapevine_Leaves_Image_Dataset"
+  dir: "tests/test_data/raw/grapevine-leaves-image-dataset/Grapevine_Leaves_Image_Dataset"
   transform_level: "light"
   batch_size: 32
   val_split: 0.2

diff --git a/project_winegrape_src_files/tests/.gitkeep → tests/.gitkeep b/project_winegrape_src_files/tests/.gitkeep → tests/.gitkeep
diff --git a/...ect_winegrape_src_files/tests/__init__.py → tests/__init__.py b/...ect_winegrape_src_files/tests/__init__.py → tests/__init__.py
diff --git a/..._winegrape_src_files/tests/test_config.py → tests/test_config.py b/..._winegrape_src_files/tests/test_config.py → tests/test_config.py
@@ -2,7 +2,7 @@
 import os
 
 def test_config() -> None:
-    with initialize(version_base=None, config_path="../conf"):
+    with initialize(version_base=None, config_path="../project_winegrape_src_files/conf"):
         test_cfg = compose(config_name="test_config")
         # assert top level keys
         assert "reproducibility" in test_cfg.keys()

diff --git a/...ct_winegrape_src_files/tests/test_data.py → tests/test_data.py b/...ct_winegrape_src_files/tests/test_data.py → tests/test_data.py
@@ -1,8 +1,8 @@
-from ..data.data import DataModule
+from project_winegrape_src_files.data.data import DataModule
 from hydra import initialize, compose
 
 def test_data():
-    with initialize(version_base=None, config_path="../conf"):
+    with initialize(version_base=None, config_path="../project_winegrape_src_files/conf"):
         test_cfg = compose(config_name="test_config")
         data_module = DataModule(
             data_dir=test_cfg.data.dir,

diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (1).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (1).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (1).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (1).png
diff --git a/...evine_Leaves_Image_Dataset/Ak/Ak (10).png → ...evine_Leaves_Image_Dataset/Ak/Ak (10).png b/...evine_Leaves_Image_Dataset/Ak/Ak (10).png → ...evine_Leaves_Image_Dataset/Ak/Ak (10).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (2).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (2).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (2).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (2).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (3).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (3).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (3).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (3).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (4).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (4).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (4).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (4).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (5).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (5).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (5).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (5).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (6).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (6).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (6).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (6).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (7).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (7).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (7).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (7).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (8).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (8).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (8).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (8).png
diff --git a/...pevine_Leaves_Image_Dataset/Ak/Ak (9).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (9).png b/...pevine_Leaves_Image_Dataset/Ak/Ak (9).png → ...pevine_Leaves_Image_Dataset/Ak/Ak (9).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (1).png → ...Image_Dataset/Ala_Idris/Ala_Idris (1).png b/...Image_Dataset/Ala_Idris/Ala_Idris (1).png → ...Image_Dataset/Ala_Idris/Ala_Idris (1).png
diff --git a/...mage_Dataset/Ala_Idris/Ala_Idris (10).png → ...mage_Dataset/Ala_Idris/Ala_Idris (10).png b/...mage_Dataset/Ala_Idris/Ala_Idris (10).png → ...mage_Dataset/Ala_Idris/Ala_Idris (10).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (2).png → ...Image_Dataset/Ala_Idris/Ala_Idris (2).png b/...Image_Dataset/Ala_Idris/Ala_Idris (2).png → ...Image_Dataset/Ala_Idris/Ala_Idris (2).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (3).png → ...Image_Dataset/Ala_Idris/Ala_Idris (3).png b/...Image_Dataset/Ala_Idris/Ala_Idris (3).png → ...Image_Dataset/Ala_Idris/Ala_Idris (3).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (4).png → ...Image_Dataset/Ala_Idris/Ala_Idris (4).png b/...Image_Dataset/Ala_Idris/Ala_Idris (4).png → ...Image_Dataset/Ala_Idris/Ala_Idris (4).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (5).png → ...Image_Dataset/Ala_Idris/Ala_Idris (5).png b/...Image_Dataset/Ala_Idris/Ala_Idris (5).png → ...Image_Dataset/Ala_Idris/Ala_Idris (5).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (6).png → ...Image_Dataset/Ala_Idris/Ala_Idris (6).png b/...Image_Dataset/Ala_Idris/Ala_Idris (6).png → ...Image_Dataset/Ala_Idris/Ala_Idris (6).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (7).png → ...Image_Dataset/Ala_Idris/Ala_Idris (7).png b/...Image_Dataset/Ala_Idris/Ala_Idris (7).png → ...Image_Dataset/Ala_Idris/Ala_Idris (7).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (8).png → ...Image_Dataset/Ala_Idris/Ala_Idris (8).png b/...Image_Dataset/Ala_Idris/Ala_Idris (8).png → ...Image_Dataset/Ala_Idris/Ala_Idris (8).png
diff --git a/...Image_Dataset/Ala_Idris/Ala_Idris (9).png → ...Image_Dataset/Ala_Idris/Ala_Idris (9).png b/...Image_Dataset/Ala_Idris/Ala_Idris (9).png → ...Image_Dataset/Ala_Idris/Ala_Idris (9).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (1).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (1).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (1).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (1).png
diff --git a/...es_Image_Dataset/Buzgulu/Buzgulu (10).png → ...es_Image_Dataset/Buzgulu/Buzgulu (10).png b/...es_Image_Dataset/Buzgulu/Buzgulu (10).png → ...es_Image_Dataset/Buzgulu/Buzgulu (10).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (2).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (2).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (2).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (2).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (3).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (3).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (3).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (3).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (4).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (4).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (4).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (4).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (5).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (5).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (5).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (5).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (6).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (6).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (6).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (6).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (7).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (7).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (7).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (7).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (8).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (8).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (8).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (8).png
diff --git a/...ves_Image_Dataset/Buzgulu/Buzgulu (9).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (9).png b/...ves_Image_Dataset/Buzgulu/Buzgulu (9).png → ...ves_Image_Dataset/Buzgulu/Buzgulu (9).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (1).png → ...eaves_Image_Dataset/Dimnit/Dimnit (1).png b/...eaves_Image_Dataset/Dimnit/Dimnit (1).png → ...eaves_Image_Dataset/Dimnit/Dimnit (1).png
diff --git a/...aves_Image_Dataset/Dimnit/Dimnit (10).png → ...aves_Image_Dataset/Dimnit/Dimnit (10).png b/...aves_Image_Dataset/Dimnit/Dimnit (10).png → ...aves_Image_Dataset/Dimnit/Dimnit (10).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (2).png → ...eaves_Image_Dataset/Dimnit/Dimnit (2).png b/...eaves_Image_Dataset/Dimnit/Dimnit (2).png → ...eaves_Image_Dataset/Dimnit/Dimnit (2).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (3).png → ...eaves_Image_Dataset/Dimnit/Dimnit (3).png b/...eaves_Image_Dataset/Dimnit/Dimnit (3).png → ...eaves_Image_Dataset/Dimnit/Dimnit (3).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (4).png → ...eaves_Image_Dataset/Dimnit/Dimnit (4).png b/...eaves_Image_Dataset/Dimnit/Dimnit (4).png → ...eaves_Image_Dataset/Dimnit/Dimnit (4).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (5).png → ...eaves_Image_Dataset/Dimnit/Dimnit (5).png b/...eaves_Image_Dataset/Dimnit/Dimnit (5).png → ...eaves_Image_Dataset/Dimnit/Dimnit (5).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (6).png → ...eaves_Image_Dataset/Dimnit/Dimnit (6).png b/...eaves_Image_Dataset/Dimnit/Dimnit (6).png → ...eaves_Image_Dataset/Dimnit/Dimnit (6).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (7).png → ...eaves_Image_Dataset/Dimnit/Dimnit (7).png b/...eaves_Image_Dataset/Dimnit/Dimnit (7).png → ...eaves_Image_Dataset/Dimnit/Dimnit (7).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (8).png → ...eaves_Image_Dataset/Dimnit/Dimnit (8).png b/...eaves_Image_Dataset/Dimnit/Dimnit (8).png → ...eaves_Image_Dataset/Dimnit/Dimnit (8).png
diff --git a/...eaves_Image_Dataset/Dimnit/Dimnit (9).png → ...eaves_Image_Dataset/Dimnit/Dimnit (9).png b/...eaves_Image_Dataset/Dimnit/Dimnit (9).png → ...eaves_Image_Dataset/Dimnit/Dimnit (9).png
diff --git a/...Leaves_Image_Dataset_Citation_Request.txt → ...Leaves_Image_Dataset_Citation_Request.txt b/...Leaves_Image_Dataset_Citation_Request.txt → ...Leaves_Image_Dataset_Citation_Request.txt
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (1).png → ..._Leaves_Image_Dataset/Nazli/Nazli (1).png b/..._Leaves_Image_Dataset/Nazli/Nazli (1).png → ..._Leaves_Image_Dataset/Nazli/Nazli (1).png
diff --git a/...Leaves_Image_Dataset/Nazli/Nazli (10).png → ...Leaves_Image_Dataset/Nazli/Nazli (10).png b/...Leaves_Image_Dataset/Nazli/Nazli (10).png → ...Leaves_Image_Dataset/Nazli/Nazli (10).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (2).png → ..._Leaves_Image_Dataset/Nazli/Nazli (2).png b/..._Leaves_Image_Dataset/Nazli/Nazli (2).png → ..._Leaves_Image_Dataset/Nazli/Nazli (2).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (3).png → ..._Leaves_Image_Dataset/Nazli/Nazli (3).png b/..._Leaves_Image_Dataset/Nazli/Nazli (3).png → ..._Leaves_Image_Dataset/Nazli/Nazli (3).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (4).png → ..._Leaves_Image_Dataset/Nazli/Nazli (4).png b/..._Leaves_Image_Dataset/Nazli/Nazli (4).png → ..._Leaves_Image_Dataset/Nazli/Nazli (4).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (5).png → ..._Leaves_Image_Dataset/Nazli/Nazli (5).png b/..._Leaves_Image_Dataset/Nazli/Nazli (5).png → ..._Leaves_Image_Dataset/Nazli/Nazli (5).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (6).png → ..._Leaves_Image_Dataset/Nazli/Nazli (6).png b/..._Leaves_Image_Dataset/Nazli/Nazli (6).png → ..._Leaves_Image_Dataset/Nazli/Nazli (6).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (7).png → ..._Leaves_Image_Dataset/Nazli/Nazli (7).png b/..._Leaves_Image_Dataset/Nazli/Nazli (7).png → ..._Leaves_Image_Dataset/Nazli/Nazli (7).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (8).png → ..._Leaves_Image_Dataset/Nazli/Nazli (8).png b/..._Leaves_Image_Dataset/Nazli/Nazli (8).png → ..._Leaves_Image_Dataset/Nazli/Nazli (8).png
diff --git a/..._Leaves_Image_Dataset/Nazli/Nazli (9).png → ..._Leaves_Image_Dataset/Nazli/Nazli (9).png b/..._Leaves_Image_Dataset/Nazli/Nazli (9).png → ..._Leaves_Image_Dataset/Nazli/Nazli (9).png