Replace numpy's deprecated dec with pytest's skipif (#423)

Author: kchawla-pi

nistats/tests/test_glm_reporter.py

@@ -4,6 +4,7 @@
 
 import nibabel as nib
 import numpy as np
+import pytest
 from nibabel import load
 from nibabel.tmpdirs import InTemporaryDirectory
 
@@ -13,7 +14,6 @@
 from nistats.design_matrix import make_first_level_design_matrix
 from nistats.first_level_model import FirstLevelModel
 from nistats.reporting import glm_reporter as glmr
-from numpy.testing import dec
 
 from nistats.second_level_model import SecondLevelModel
 
@@ -26,7 +26,8 @@
     mpl  # So flake8 doesn't complain about not using import (F841)
 
 
-@dec.skipif(not_have_mpl)
+@pytest.mark.skipif(not_have_mpl,
+                    reason='Matplotlib not installed; required for this test')
 def test_flm_reporting():
     with InTemporaryDirectory():
         shapes, rk = ((7, 8, 7, 15), (7, 8, 7, 16)), 3
@@ -50,10 +51,11 @@ def test_flm_reporting():
         report_iframe = report_flm.get_iframe()
         # So flake8 doesn't complain about not using variable (F841)
         report_iframe
-        del mask, flm
+        del mask, flm, fmri_data
 
 
-@dec.skipif(not_have_mpl)
+@pytest.mark.skipif(not_have_mpl,
+                    reason='Matplotlib not installed; required for this test')
 def test_slm_reporting():
     with InTemporaryDirectory():
         shapes = ((7, 8, 9, 1),)

nistats/tests/test_reporting.py

@@ -2,11 +2,11 @@
 
 import nibabel as nib
 import numpy as np
+import pytest
 
 from nibabel.tmpdirs import InTemporaryDirectory
 # Set backend to avoid DISPLAY problems
 from nilearn.plotting import _set_mpl_backend
-from numpy.testing import dec
 
 from nistats.design_matrix import make_first_level_design_matrix
 from nistats.reporting import (get_clusters_table,
@@ -27,7 +27,8 @@
     have_mpl = True
 
 
-@dec.skipif(not have_mpl)
+@pytest.mark.skipif(not have_mpl,
+                    reason='Matplotlib not installed; required for this test')
 def test_show_design_matrix():
     # test that the show code indeed (formally) runs
     frame_times = np.linspace(0, 127 * 1., 128)
@@ -42,7 +43,9 @@ def test_show_design_matrix():
         plot_design_matrix(dmtx, output_file='dmtx.pdf')
         assert os.path.exists('dmtx.pdf')
 
-@dec.skipif(not have_mpl)
+
+@pytest.mark.skipif(not have_mpl,
+                    reason='Matplotlib not installed; required for this test')
 def test_show_contrast_matrix():
     # test that the show code indeed (formally) runs
     frame_times = np.linspace(0, 127 * 1., 128)