More deprecated stuff.

Author: arokem

nitime/algorithms/tests/test_autoregressive.py

@@ -1,6 +1,5 @@
 import numpy as np
 import numpy.testing as npt
-import numpy.testing.decorators as dec
 
 import nitime.algorithms as tsa
 import nitime.utils as utils
@@ -87,7 +86,6 @@ def test_AR_LD():
     npt.assert_almost_equal(avg_pwr, avg_pwr_est, decimal=0)
 
 
-@dec.slow
 def test_MAR_est_LWR():
     """
 

nitime/algorithms/tests/test_spectral.py

@@ -7,7 +7,6 @@
 import scipy
 from scipy import fftpack
 import numpy.testing as npt
-import numpy.testing.decorators as dec
 import pytest
 
 import nitime.algorithms as tsa
@@ -320,7 +319,6 @@ def test_mtm_cross_spectrum():
         tsa.mtm_cross_spectrum(tspectra, np.r_[tspectra, tspectra], (w, w))
 
 
-@dec.slow
 def test_multi_taper_psd_csd():
     """
 

nitime/analysis/base.py

@@ -1,5 +1,5 @@
 
-from inspect import getargspec
+from inspect import getfullargspec
 
 from nitime import descriptors as desc
 
@@ -16,7 +16,7 @@ class BaseAnalyzer(desc.ResetMixin):
 
     @desc.setattr_on_read
     def parameterlist(self):
-        plist = getargspec(self.__init__).args
+        plist = getfullargspec(self.__init__).args
         plist.remove('self')
         plist.remove('input')
         return plist

nitime/tests/test_algorithms.py

@@ -2,7 +2,6 @@
 
 import numpy as np
 import numpy.testing as npt
-import numpy.testing.decorators as dec
 
 from scipy.signal import signaltools
 from scipy import fftpack
@@ -161,7 +160,7 @@ def test_psd_matlab():
 
     npt.assert_almost_equal(fxx_mlab, fxx_matlab, decimal=5)
 
-@dec.slow
+
 def test_long_dpss_win():
     """ Test that very long dpss windows can be generated (using interpolation)"""
 

nitime/viz.py

@@ -9,9 +9,6 @@
 import sys
 from nitime.six.moves import map
 from nitime.six.moves import zip
-if "nose" in sys.modules:
-    import matplotlib
-    matplotlib.use('agg')
 
 # Then do all the rest of it:
 import numpy as np
@@ -20,7 +17,7 @@
 from matplotlib import pyplot as plt
 import matplotlib.ticker as ticker
 import matplotlib.colors as colors
-from mpl_toolkits.axes_grid import make_axes_locatable
+from mpl_toolkits.axes_grid1 import make_axes_locatable
 
 from nitime import timeseries as ts
 import nitime.utils as tsu