Merge pull request #175 from arokem/matmul

Use legacy Python syntax

Author: arokem

.travis.yml

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

nitime/algorithms/event_related.py

@@ -55,9 +55,9 @@ def fir(timeseries, design):
     and Unbiased Approach. Human Brain Mapping, 11:249-260
 
     """
-    X = np.array(design)
-    y = np.array(timeseries)
-    h = np.array(linalg.pinv(X.T @ X) @ X.T @ y.T)
+    h = np.array(np.dot(np.dot(linalg.pinv(np.dot(design.T, design)),
+                               design.T),
+                        timeseries.T))
     return h
 
 

nitime/analysis/base.py

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

nitime/version.py

@@ -2,10 +2,10 @@
 
 # Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"
 _version_major = 0
-_version_minor = 9
-_version_micro = ''  # use '' for first of series, number for 1 and above
-_version_extra = 'dev'
-# _version_extra = ''  # Uncomment this for full releases
+_version_minor = 8
+_version_micro = 1  # use '' for first of series, number for 1 and above
+# _version_extra = 'dev'
+_version_extra = ''  # Uncomment this for full releases
 
 # Construct full version string from these.
 _ver = [_version_major, _version_minor]

requirements-dev.txt

@@ -1,5 +1,5 @@
 sphinx
-pytest==3.6
+pytest==3.6.1
 pytest-cov
 nibabel
 networkx