Merge pull request #170 from arokem/drop_py2

Drop Python 2, use requirements-dev in travis config.

Author: arokem

.travis.yml

@@ -10,19 +10,11 @@ deploy:
     repo: nipy/nitime
 
 python:
-- 2.7
 - 3.6
 
-env:
-- PIP_DEPS="pip pytest pytest-cov coverage coveralls python-coveralls "
-
-
-python:
-- '2.7'
-- '3.6'
-
 install:
-- travis_retry pip install $PIP_DEPS
+- travis_retry pip install -r requirements-dev.txt
+- travis_retry pip install -r requirements.txt
 - travis_retry pip install -e .
 
 script:

nitime/tests/test_lazy.py

@@ -1,7 +1,6 @@
 import sys
-import os
+import numpy as np
 import numpy.testing as npt
-import numpy.testing.decorators as dec
 
 import pytest
 
@@ -17,7 +16,8 @@ def test_lazy():
     # repr for mlab should be <module 'matplotlib.mlab' will be lazily loaded>
     assert 'lazily loaded' in repr(mlab)
     # accessing mlab's attribute will cause an import of mlab
-    npt.assert_equal(mlab.dist(1969,2011), 42.0)
+    npt.assert_(np.all(mlab.detrend_mean(np.array([1, 2, 3]))  ==
+                       np.array([-1., 0., 1.])))
     # now mlab should be of class LoadedLazyImport an repr(mlab) should be
     # <module 'matplotlib.mlab' from # '.../matplotlib/mlab.pyc>
     assert 'lazily loaded' not in repr(mlab)

requirements-dev.txt

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