Merge pull request #176 from arokem/drop_legacy

Drop legacy

Author: arokem

.travis.yml

@@ -3,8 +3,6 @@ sudo: false
 
 python:
 - 3.6
-- 3.4
-- 2.7
 
 install:
 - travis_retry pip install -r requirements-dev.txt

nitime/__init__.py

@@ -26,6 +26,5 @@
 from . import algorithms
 from . import timeseries
 from . import analysis
-from . import six
 
 from .timeseries import *

nitime/algorithms/event_related.py

@@ -55,10 +55,7 @@ def fir(timeseries, design):
     and Unbiased Approach. Human Brain Mapping, 11:249-260
 
     """
-    h = np.array(np.dot(np.dot(linalg.pinv(np.dot(design.T, design)),
-                               design.T),
-                        timeseries.T))
-    return h
+    return linalg.pinv(design.T @design) @ design.T @ timeseries.T
 
 
 def freq_domain_xcorr(tseries, events, t_before, t_after, Fs=1):

nitime/analysis/base.py

@@ -1,8 +1,5 @@
 
-try:
-    from inspect import getfullargspec
-except ImportError:  # PY2
-    from inspect import getargspec as getfullargspec
+from inspect import getfullargspec
 
 from nitime import descriptors as desc