FIX: Accommodate recent versions of matplotlib and scipy

Author: effigies

nitime/analysis/spectral.py

@@ -418,8 +418,8 @@ def iir(self):
 
             wp = [lb_frac, ub_frac]
 
-            ws = [np.max([lb_frac - 0.1, 0]),
-                  np.min([ub_frac + 0.1, 1.0])]
+            ws = [np.max([lb_frac - 0.1, 0.001]),
+                  np.min([ub_frac + 0.1, 0.999])]
 
         # For the lowpass:
         elif lb_frac == 0:

nitime/tests/test_algorithms.py

@@ -149,7 +149,7 @@ def test_psd_matlab():
 
     NFFT = 256
     Fs = 1.0
-    noverlap = NFFT / 2
+    noverlap = NFFT // 2
 
     fxx, f = mlab.psd(ts0, NFFT=NFFT, Fs=Fs, noverlap=noverlap,
                       scale_by_freq=True)