diff --git a/.travis.yml b/.travis.yml index 2c45c1c2..4e567983 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,10 +18,10 @@ env: # Note that the 2.6 build doesn't get flake8, and runs old versions of # Pyglet and GLFW to make sure we deal with those correctly #- PYTHON=2.6 QT=pyqt TEST=standard - - PYTHON=2.7 QT=pyqt TEST=standard - #- PYTHON=2.7 QT=pyside TEST=standard + - PYTHON=2.7 QT=pyqt TEST=extra + - PYTHON=2.7 QT=pyside TEST=standard #- PYTHON=3.3 QT=pyqt TEST=standard - #- PYTHON=3.3 QT=pyside TEST=extra + #- PYTHON=3.3 QT=pyside TEST=standard before_install: diff --git a/pyqtgraph/tests/test_functions.py b/pyqtgraph/tests/test_functions.py index af0dde58..47fa266d 100644 --- a/pyqtgraph/tests/test_functions.py +++ b/pyqtgraph/tests/test_functions.py @@ -34,8 +34,9 @@ def test_interpolateArray(): result = pg.interpolateArray(data, x) - import scipy.ndimage - spresult = scipy.ndimage.map_coordinates(data, x.T, order=1) + #import scipy.ndimage + #spresult = scipy.ndimage.map_coordinates(data, x.T, order=1) + spresult = np.array([ 5.92, 20. , 11. , 0. , 0. ]) # generated with the above line assert_array_almost_equal(result, spresult) @@ -54,7 +55,10 @@ def test_interpolateArray(): [[1.5, 0.5], [1.5, 1.0], [1.5, 1.5]]]) r1 = pg.interpolateArray(data, x) - r2 = scipy.ndimage.map_coordinates(data, x.transpose(2,0,1), order=1) + #r2 = scipy.ndimage.map_coordinates(data, x.transpose(2,0,1), order=1) + r2 = np.array([[ 8.25, 11. , 16.5 ], # generated with the above line + [ 82.5 , 110. , 165. ]]) + assert_array_almost_equal(r1, r2)