fix up optional mpl management

Author: TomDonoghue

specparam/plts/aperiodic.py

@@ -3,7 +3,6 @@
 from itertools import cycle
 
 import numpy as np
-import matplotlib.pyplot as plt
 
 from specparam.sim.gen import gen_freqs
 from specparam.modutils.dependencies import safe_import, check_dependency

specparam/tests/models/test_group.py

@@ -232,7 +232,7 @@ def test_print(tfg):
     tfg.print_results()
     assert True
 
-def test_save_model_report(tfg):
+def test_save_model_report(tfg, skip_if_no_mpl):
 
     file_name = 'test_group_model_report'
     tfg.save_model_report(0, file_name, TEST_REPORTS_PATH)

specparam/tests/plts/test_styles.py

@@ -2,8 +2,12 @@
 
 from specparam.tests.tutils import plot_test
 
+from specparam.modutils.dependencies import safe_import
+
 from specparam.plts.style import *
 
+plt = safe_import('.pyplot', 'matplotlib')
+
 ###################################################################################################
 ###################################################################################################
 
@@ -14,17 +18,14 @@ def test_check_style_options():
 def test_style_spectrum_plot(skip_if_no_mpl):
 
     # Create a dummy plot and style it
-    from specparam.modutils.dependencies import safe_import
-    plt = safe_import('.pyplot', 'matplotlib')
     _, ax = plt.subplots()
     style_spectrum_plot(ax, False, False)
 
     # Check that axis labels are added - use as proxy that it ran correctly
     assert ax.xaxis.get_label().get_text()
     assert ax.yaxis.get_label().get_text()
 
-
-def test_apply_axis_style():
+def test_apply_axis_style(skip_if_no_mpl):
 
     _, ax = plt.subplots()
 
@@ -38,8 +39,7 @@ def test_apply_axis_style():
     assert ax.get_xlim() == xlim
     assert ax.get_ylabel() == ylabel
 
-
-def test_apply_line_style():
+def test_apply_line_style(skip_if_no_mpl):
 
     # Check applying style to one line
     _, ax = plt.subplots()
@@ -60,8 +60,7 @@ def test_apply_line_style():
     for line, alpha in zip(ax.get_lines(), alphas):
         assert line.get_alpha() == alpha
 
-
-def test_apply_custom_style():
+def test_apply_custom_style(skip_if_no_mpl):
 
     _, ax = plt.subplots()
     ax.set_title('placeholder')
@@ -75,8 +74,7 @@ def test_apply_custom_style():
     apply_custom_style(ax, title_fontsize=new_title_fontsize)
     assert ax.title.get_size() == new_title_fontsize
 
-
-def test_apply_style():
+def test_apply_style(skip_if_no_mpl):
 
     _, ax = plt.subplots()
 
@@ -89,9 +87,8 @@ def my_custom_styler(ax, **kwargs):
     # Apply plot style passing in a styler
     apply_style(ax, custom_styler=my_custom_styler)
 
-
 @plot_test
-def test_style_plot():
+def test_style_plot(skip_if_no_mpl):
 
     @style_plot
     def example_plot():

specparam/tests/plts/test_utils.py

@@ -9,7 +9,8 @@
 
 from specparam.plts.utils import *
 
-mpl = safe_import('matplotlib')
+#mpl = safe_import('matplotlib')
+plt = safe_import('.pyplot', 'matplotlib')
 
 ###################################################################################################
 ###################################################################################################
@@ -19,7 +20,7 @@ def test_check_ax(skip_if_no_mpl):
     figsize = [5., 5.]
     ax = check_ax(None, figsize=figsize)
 
-    assert isinstance(ax, mpl.axes.Axes)
+    assert isinstance(ax, plt.axes.Axes)
     assert figsize == [ax.get_figure().get_figwidth(),
                        ax.get_figure().get_figheight()]
 
@@ -79,7 +80,7 @@ def test_check_plot_kwargs(skip_if_no_mpl):
     assert plot_kwargs['alpha'] == 0.5
     assert plot_kwargs['linewidth'] == 2
 
-def test_savefig():
+def test_savefig(skip_if_no_mpl):
 
     @savefig
     def example_plot():
@@ -102,7 +103,7 @@ def example_plot():
     example_plot(save_fig=False, file_path=TEST_PLOTS_PATH, file_name='test_savefig_nope.pdf')
     assert not os.path.exists(TEST_PLOTS_PATH / 'test_savefig_nope.pdf')
 
-def test_save_figure():
+def test_save_figure(skip_if_no_mpl):
 
     plt.plot([1, 2], [3, 4])
     save_figure(file_name='test_save_figure.pdf', file_path=TEST_PLOTS_PATH)