Adjust test output file names for windows compatibility

theislab · Mar 27, 2024 · a8f0d53 · a8f0d53
1 parent a59b319
commit a8f0d53
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 4 deletions.
diff --git a/...evaluation_plot_cluster_similarity_{}.png → ...a/evaluation_plot_cluster_similarity_.png b/...evaluation_plot_cluster_similarity_{}.png → ...a/evaluation_plot_cluster_similarity_.png
diff --git a/..._data/evaluation_plot_coexpression_{}.png → ...st_data/evaluation_plot_coexpression_.png b/..._data/evaluation_plot_coexpression_{}.png → ...st_data/evaluation_plot_coexpression_.png
diff --git a/...a/evaluation_plot_confusion_matrix_{}.png → ...ata/evaluation_plot_confusion_matrix_.png b/...a/evaluation_plot_confusion_matrix_{}.png → ...ata/evaluation_plot_confusion_matrix_.png
diff --git a/tests/plotting/test_data/evaluation_plot_correlation_matrix_{}.png b/tests/plotting/test_data/evaluation_plot_correlation_matrix_{}.png
diff --git a/...elections_info': 'selections_info_1'}.png → ...one_selections_info-selections_info_1.png b/...elections_info': 'selections_info_1'}.png → ...one_selections_info-selections_info_1.png
diff --git a/...elections_info': 'selections_info_2'}.png → ...one_selections_info-selections_info_2.png b/...elections_info': 'selections_info_2'}.png → ...one_selections_info-selections_info_2.png
diff --git a/...selection'], 'selections_info': None}.png → ...papros_selection_selections_info-None.png b/...selection'], 'selections_info': None}.png → ...papros_selection_selections_info-None.png
diff --git a/tests/plotting/test_data/plot_summary.png b/tests/plotting/test_data/plot_summary.png
diff --git a/...g/test_data/selection_plot_clf_genes_{'till_rank': 2, 'importance_th': 0.8}.png b/...g/test_data/selection_plot_clf_genes_{'till_rank': 2, 'importance_th': 0.8}.png
diff --git a/...ion_{'selections': None, 'n_cols': 1}.png → ...coexpression_selections-None_n_cols-1.png b/...ion_{'selections': None, 'n_cols': 1}.png → ...coexpression_selections-None_n_cols-1.png
diff --git a/...ion_{'selections': None, 'n_cols': 3}.png → ...coexpression_selections-None_n_cols-3.png b/...ion_{'selections': None, 'n_cols': 3}.png → ...coexpression_selections-None_n_cols-3.png
diff --git a/...ions': ['marker'], 'colorbar': False}.png → ...sion_selections-marker_colorbar-False.png b/...ions': ['marker'], 'colorbar': False}.png → ...sion_selections-marker_colorbar-False.png
diff --git a/..._plot_gene_overlap_{'style': 'upset'}.png → ...lection_plot_gene_overlap_style-upset.png b/..._plot_gene_overlap_{'style': 'upset'}.png → ...lection_plot_gene_overlap_style-upset.png
diff --git a/...n_plot_gene_overlap_{'style': 'venn'}.png → ...election_plot_gene_overlap_style-venn.png b/...n_plot_gene_overlap_{'style': 'venn'}.png → ...election_plot_gene_overlap_style-venn.png
diff --git a/tests/plotting/test_plotting.py b/tests/plotting/test_plotting.py
@@ -8,6 +8,21 @@
 # Note: The figures depend somehow on the environment!
 # Tests might fail if compared figures derived from different envs eg development env and test env
 
+def _transform_string(s):
+    """Transforms a string by replacing ': ' with '-' and ', ' with '_',
+    and then removing problematic characters for Windows filenames.
+    
+    In the tests we use the kwargs of the functions as strings to name output files. To get a valid name for windows 
+    we need to replace certain characters.
+    """
+    # Initial replacements
+    transformed = s.replace(': ', '-').replace(', ', '_')
+
+    # Additional removals
+    for char in [':', ',', '{', '}', "'", '[', ']']:
+        transformed = transformed.replace(char, '')
+
+    return transformed
 
 #############
 # selection #
@@ -106,8 +121,8 @@ def test_masked_dotplot(small_adata, selector, tmp_path):
 # TODO maybe add "plot_confusion_matrix_difference", "plot_marker_correlation"
 # TODO add further kwargs for each fun
 def test_selection_plots(selector_with_marker, fun, tmp_path, kwargs):
-    ref_name = f"tests/plotting/test_data/selection_{fun}_{kwargs}.png"
-    fig_name = f"{tmp_path}/selection_{fun}_{kwargs}.png"
+    ref_name = _transform_string(f"tests/plotting/test_data/selection_{fun}_{kwargs}.png")
+    fig_name = _transform_string(f"{tmp_path}/selection_{fun}_{kwargs}.png")
     getattr(selector_with_marker, fun)(save=fig_name, show=False, **kwargs)
     # getattr(selector_with_marker, fun)(save=ref_name, show=False, **kwargs)
     assert compare_images(ref_name, fig_name, 0.001) is None
@@ -151,8 +166,8 @@ def test_plot_summary(evaluator, tmp_path):
 # TODO maybe add "plot_confusion matrix_difference", "plot_marker_correlation"
 # TODO add further kwargs for each fun
 def test_evaluation_plots(evaluator_4_sets, fun, tmp_path, kwargs, request):
-    ref_name = f"tests/plotting/test_data/evaluation_{fun}_{kwargs}.png"
-    fig_name = f"{tmp_path}/evaluation_{fun}_{kwargs}.png"
+    ref_name = _transform_string(f"tests/plotting/test_data/evaluation_{fun}_{kwargs}.png")
+    fig_name = _transform_string(f"{tmp_path}/evaluation_{fun}_{kwargs}.png")
     if "selections_info" in kwargs:
         if kwargs["selections_info"] is not None:
             kwargs["selections_info"] = request.getfixturevalue(kwargs["selections_info"])