ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enable pyside, line ending check

Browse Source 
fix test
This commit is contained in:
Luke Campagnola 2014-03-24 17:23:03 -04:00
parent d7df4517f9
commit 1e3cc95e37
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -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:

10
pyqtgraph/tests/test_functions.py
View File

@ -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)