merge dev

flatironinstitute · Aug 12, 2024 · aab81a0 · aab81a0
2 parents 0ce2df1 + 18712d6
commit aab81a0
Show file tree

Hide file tree

Showing 26 changed files with 284 additions and 231 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -32,13 +32,6 @@ jobs:
           pip install .
           pip install pytest omegaconf
 
-      - name: Get test data from OSF
-        run: |
-          sh tests/scripts/fetch_test_data.sh
-
       - name: Test with pytest
         run: |
-          pytest tests/test_preprocessing.py
-          pytest tests/test_svd.py
-          pytest tests/test_map_to_map.py
-          pytest tests/test_distribution_to_distribution.py
+          pytest tests
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,7 @@ data/dataset_2_submissions
 data/dataset_1_submissions
 data/dataset_2_ground_truth
 
-# data for testing and resulting outputs
-tests/data/Ground_truth
-tests/data/dataset_2_submissions/
-tests/data/unprocessed_dataset_2_submissions/submission_x/
+# testing results
 tests/results/
 
 

diff --git a/...es/config_map_to_map_distance_matrix.yaml → config_files/config_map_to_map.yaml b/...es/config_map_to_map_distance_matrix.yaml → config_files/config_map_to_map.yaml
diff --git a/src/cryo_challenge/_commands/run_map2map_pipeline.py b/src/cryo_challenge/_commands/run_map2map_pipeline.py
@@ -6,7 +6,7 @@
 import os
 import yaml
 
-from .._map_to_map.map_to_map_distance_matrix import run
+from .._map_to_map.map_to_map_pipeline import run
 from ..data._validation.config_validators import validate_input_config_mtm