461 revert compare images changes (#472)

* Revert "Feature 461 make compare images configurable (#467)" This reverts commit 5c189be. * 461: keep CompareImages in conftest
dtcenter · Oct 31, 2024 · 3e6022c · 3e6022c
1 parent af7eecf
commit 3e6022c
Show file tree

Hide file tree

Showing 23 changed files with 75 additions and 48 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+relative_files = True
diff --git a/test/bar/test_bar.py b/test/bar/test_bar.py
@@ -3,7 +3,7 @@
 import pytest
 
 from metplotpy.plots.bar import bar
-from metcalcpy.compare_images import CompareImages
+# from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 CLEANUP_FILES = ['bar.png', 'bar.points1']
@@ -71,6 +71,7 @@ def test_no_nans_in_points_file(setup, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
+@pytest.mark.skip("fails on linux host machines")
 def test_images_match(setup, remove_files):
     """
         Compare an expected plot with the
@@ -82,6 +83,7 @@ def test_images_match(setup, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
+@pytest.mark.skip("fails on linux host machines")
 def test_none_data_images_match(setup_nones):
     """
         Compare an expected plot with the
@@ -139,6 +141,7 @@ def test_point_and_plot_files_exist_default(setup_env, remove_files):
     remove_files(cwd, check_files)
 
 
+@pytest.mark.skip("fails on linux host machines")
 def test_threshold_plotting(setup_env, remove_files):
     """
       Verify that the bar plot using data with thresholds is correct.

diff --git a/test/box/test_box.py b/test/box/test_box.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.box import box
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 CLEANUP_FILES = ['box.png', 'box.points1']
@@ -28,6 +28,7 @@ def test_files_exist(setup, test_input, expected, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
+@pytest.mark.skip("fails on linux hosts")
 def test_images_match(setup):
     """
         Compare an expected plot with the

diff --git a/test/contour/test_contour.py b/test/contour/test_contour.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.contour import contour
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 
@@ -42,7 +42,7 @@ def test_files_exist(setup, test_input, expected):
     assert os.path.isfile(test_input) == expected
     cleanup()
 
-
+@pytest.mark.skip("fails on linux hosts")
 def test_images_match(setup):
     """
         Compare an expected plots with the

diff --git a/test/eclv/test_eclv.py b/test/eclv/test_eclv.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.eclv import eclv
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 
@@ -49,6 +49,7 @@ def test_files_exist(setup, test_input, expected):
     assert os.path.isfile(test_input) == expected
     cleanup()
 
+@pytest.mark.skip("fails on linux hosts")
 def test_images_match(setup):
     """
         Compare an expected plots with the

diff --git a/test/ens_ss/test_ens_ss.py b/test/ens_ss/test_ens_ss.py
@@ -1,6 +1,6 @@
 import os
 import pytest
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 from metplotpy.plots.ens_ss import ens_ss
 
 cwd = os.path.dirname(__file__)
@@ -43,7 +43,7 @@ def test_files_exist( setup, test_input, expected):
     assert os.path.isfile(test_input) == expected
     cleanup()
 
-
+@pytest.mark.skip("fails on linux hosts")
 def test_images_match(setup):
     """
         Compare an expected plot with the

diff --git a/test/equivalence_testing_bounds/test_equivalence_testing_bounds.py b/test/equivalence_testing_bounds/test_equivalence_testing_bounds.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.equivalence_testing_bounds import equivalence_testing_bounds as etb
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 CLEANUP_FILES = ['equivalence_testing_bounds.png', 'equivalence_testing_bounds.points1']
@@ -29,6 +29,7 @@ def test_files_exist(setup, test_input, expected, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
+@pytest.mark.skip("skimage differences causing failure")
 def test_images_match(setup, remove_files):
     '''
         Compare an expected plot with the

diff --git a/test/histogram/test_prob_hist.py b/test/histogram/test_prob_hist.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.histogram import prob_hist
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 
@@ -35,7 +35,7 @@ def test_files_exist(setup, test_input, expected):
     assert os.path.isfile(f"{cwd}/{test_input}") == expected
     cleanup()
 
-
+@pytest.mark.skip("Image comparisons fail during Github Actions checks.")
 def test_images_match(setup):
     """
         Compare an expected plot with the

diff --git a/test/histogram/test_rank_hist.py b/test/histogram/test_rank_hist.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.histogram import rank_hist
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 
@@ -36,6 +36,7 @@ def test_files_exist(setup, test_input, expected):
     cleanup()
 
 
+@pytest.mark.skip("Image comparisons fail during Github Actions checks.")
 def test_images_match(setup):
     """
         Compare an expected plot with the

diff --git a/test/histogram/test_rel_hist.py b/test/histogram/test_rel_hist.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.histogram import rel_hist
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 
@@ -39,6 +39,7 @@ def test_files_exist(setup, test_input, expected):
     cleanup()
 
 
+@pytest.mark.skip("Image comparisons fail in Github Actions checks.")
 def test_images_match(setup):
     """
         Compare an expected plot with the

diff --git a/test/histogram_2d/test_histogram_2d.py b/test/histogram_2d/test_histogram_2d.py
@@ -3,6 +3,8 @@
 
 from metplotpy.plots.histogram_2d import histogram_2d as h2d
 
+# from metcalcpy.compare_images import CompareImages
+
 cwd = os.path.dirname(__file__)
 
 

diff --git a/test/hovmoeller/test_hovmoeller.py b/test/hovmoeller/test_hovmoeller.py
@@ -2,7 +2,7 @@
 import pytest
 import metplotpy.plots.hovmoeller.hovmoeller as hov
 from metplotpy.plots import util
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 def dict_to_yaml(data_dict,
                 output_yaml = "test_hovmoeller.yaml"):
@@ -22,7 +22,8 @@ def cleanup(file_to_remove):
         # don't exist.  Ignore.
         pass
 
-@pytest.mark.skip("Requires specific netCDF input")
+
+@pytest.mark.skip()
 def test_default_plot_images_match():
     '''
         Compare an expected plot with the

diff --git a/test/line/test_line_groups_plot.py b/test/line/test_line_groups_plot.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.line import line as l
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 
@@ -47,7 +47,7 @@ def test_files_exist(setup, test_input, expected):
     assert os.path.isfile(test_input) == expected
     cleanup()
 
-
+@pytest.mark.skip("fails on linux hosts")
 def test_images_match(setup):
     '''
         Compare an expected plot with the

diff --git a/test/line/test_line_plot.py b/test/line/test_line_plot.py
@@ -5,7 +5,7 @@
 
 cwd = os.path.dirname(__file__)
 
-from metcalcpy.compare_images import CompareImages
+# from metcalcpy.compare_images import CompareImages
 
 
 @pytest.fixture
@@ -147,6 +147,7 @@ def test_no_nans_in_points_files():
         pass
 
 
+@pytest.mark.skip()
 def test_images_match(setup):
     '''
         Compare an expected plot with the
@@ -163,6 +164,7 @@ def test_images_match(setup):
     cleanup()
 
 
+@pytest.mark.skip()
 def test_new_images_match():
     '''
         Compare an expected plot with the start_at_zero option, with the
@@ -321,20 +323,21 @@ def test_fixed_var_val():
         pass
 
 
-@pytest.mark.skip("This test currently raises an error on line 81 of line.py. This can"
-                  " probably be fixed be revisiting fbias_fixed_vars_vals.yaml")
+@pytest.mark.skip("Image comparison for development only due to differences in hosts")
 def test_fixed_var_val_image_compare():
     """
         Verify that the fixed_vars_vals_input setting reproduces the
         expected plot.
 
     """
+    from metcalcpy.compare_images import CompareImages
 
     # Set up the METPLOTPY_BASE so that met_plot.py will correctly find
     # the config directory containing all the default config files.
     os.environ['METPLOTPY_BASE'] = f"{cwd}/../../"
     os.environ['TEST_DIR'] = cwd
     custom_config_filename = f"{cwd}/fbias_fixed_vars_vals.yaml"
+
     # Invoke the command to generate a line plot based on
     # the custom config file.
     l.main(custom_config_filename)
@@ -346,7 +349,10 @@ def test_fixed_var_val_image_compare():
         created_file = os.path.join(cwd, plot_file)
 
         # first verify that the output plot was created
-        assert os.path.exists(created_file)
+        if os.path.exists(created_file):
+            assert True
+        else:
+            assert False
 
         comparison = CompareImages(expected_plot, created_file)
 

diff --git a/test/mpr_plot/test_mpr_plot.py b/test/mpr_plot/test_mpr_plot.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.mpr_plot import mpr_plot
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 CLEANUP_FILES = ['mpr_plots.png']
@@ -29,6 +29,7 @@ def test_files_exist(setup, test_input, expected, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
+@pytest.mark.skip("unreliable-sometimes fails due to differences between machines.")
 def test_images_match(setup, remove_files):
     """
         Compare an expected plot with the

diff --git a/test/performance_diagram/test_performance_diagram.py b/test/performance_diagram/test_performance_diagram.py
@@ -2,7 +2,7 @@
 import pytest
 
 from metplotpy.plots.performance_diagram import performance_diagram as pd
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 
@@ -89,6 +89,7 @@ def test_files_exist(setup_env, test_input, expected_bool, remove_files):
         pass
 
 
+@pytest.mark.skip()
 def test_images_match(setup, remove_files):
     '''
         Compare an expected plot with the

diff --git a/test/reliability_diagram/test_reliability_diagram.py b/test/reliability_diagram/test_reliability_diagram.py
@@ -2,7 +2,7 @@
 import pytest
 import os
 from metplotpy.plots.reliability_diagram import reliability as r
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 CLEANUP_FILES = ['reliability.png', 'reliability.points1']
@@ -30,6 +30,7 @@ def test_files_exist(setup, test_input, expected, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
+@pytest.mark.skip("depends on machine on which this is run")
 def test_images_match(setup, remove_files):
     '''
         Compare an expected plot with the

diff --git a/test/revision_box/test_revision_box.py b/test/revision_box/test_revision_box.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.revision_box import revision_box
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 CLEANUP_FILES = ['revision_box.png', 'revision_box.points1']
@@ -29,6 +29,7 @@ def test_files_exist(setup, test_input, expected, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
+@pytest.mark.skip("fails on linux hosts")
 def test_images_match(setup, remove_files):
     """
         Compare an expected plot with the

diff --git a/test/revision_series/test_revision_series.py b/test/revision_series/test_revision_series.py
@@ -1,7 +1,7 @@
 import pytest
 import os
 from metplotpy.plots.revision_series import revision_series
-from metcalcpy.compare_images import CompareImages
+#from metcalcpy.compare_images import CompareImages
 
 cwd = os.path.dirname(__file__)
 CLEANUP_FILES = ('revision_series.png', 'revision_series.points1')
@@ -29,7 +29,7 @@ def test_files_exist(setup, test_input, expected, remove_files):
     remove_files(cwd, CLEANUP_FILES)
 
 
-# @pytest.mark.skip("fails on linux hosts")
+@pytest.mark.skip("fails on linux hosts")
 def test_images_match(setup, remove_files):
     """
         Compare an expected plot with the

diff --git a/test/roc_diagram/test_roc_diagram.py b/test/roc_diagram/test_roc_diagram.py
@@ -4,7 +4,7 @@
 import os
 import pandas as pd
 from metplotpy.plots.roc_diagram import roc_diagram as roc
-from metcalcpy.compare_images import CompareImages
+# from metcalcpy.compare_images import CompareImages
 import metcalcpy.util.ctc_statistics as ctc
 
 cwd = os.path.dirname(__file__)
@@ -209,6 +209,7 @@ def test_ee_returns_empty_df(capsys, remove_files):
     remove_files(cwd, ['CTC_ROC_ee.png', 'CTC_ROC_ee.html'])
 
 
+@pytest.mark.skip("skip image comparison")
 def test_images_match(setup, remove_files):
     '''
         Compare an expected plot with the

diff --git a/test/scatter/test_scatter.py b/test/scatter/test_scatter.py
@@ -11,3 +11,4 @@ def test_scatter(assert_json_equal):
 def test_main():
     # check that main can execute without error.
     scatter.main()
+