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

Skipping problematic test on py2/qt4/linux

Browse Source
This commit is contained in:
Ognyan Moore 2020-02-21 16:24:33 -08:00
parent 07af12d489
commit 1549959902
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
azure-test-template.yml
View File

@ -100,12 +100,6 @@ jobs:
conda config --prepend channels conda-forge conda config --prepend channels conda-forge
fi fi
conda info conda info
if [ $(python.version) == '2.7' ] && [ $(agent.os) == 'Linux' ]
then
pip install --upgrade pip==19.3.1
conda install setuptools=44.0.0 --yes --quiet
conda install nomkl
fi
conda install $(qt.bindings) numpy scipy pyopengl h5py six --yes --quiet conda install $(qt.bindings) numpy scipy pyopengl h5py six --yes --quiet
else else
pip install $(qt.bindings) numpy scipy pyopengl h5py six pip install $(qt.bindings) numpy scipy pyopengl h5py six

8
pyqtgraph/graphicsItems/tests/test_ROI.py
View File

@ -4,11 +4,15 @@ import pytest
import pyqtgraph as pg import pyqtgraph as pg
from pyqtgraph.Qt import QtCore, QtTest from pyqtgraph.Qt import QtCore, QtTest
from pyqtgraph.tests import assertImageApproved, mouseMove, mouseDrag, mouseClick, TransposedImageItem, resizeWindow from pyqtgraph.tests import assertImageApproved, mouseMove, mouseDrag, mouseClick, TransposedImageItem, resizeWindow
import pytest
import platform
import six
app = pg.mkQApp() app = pg.mkQApp()
reason = ("Test fails intermittently, will be deprecating py2/qt4 support soon anyway")
@pytest.mark.skipif(six.PY2 and pg.Qt.QT_LIB in {"PySide", "PyQt4"} and platform.system() == "Linux", reason=reason)
def test_getArrayRegion(transpose=False): def test_getArrayRegion(transpose=False):
pr = pg.PolyLineROI([[0, 0], [27, 0], [0, 28]], closed=True) pr = pg.PolyLineROI([[0, 0], [27, 0], [0, 28]], closed=True)
pr.setPos(1, 1) pr.setPos(1, 1)
@ -33,7 +37,7 @@ def test_getArrayRegion(transpose=False):
finally: finally:
pg.setConfigOptions(imageAxisOrder=origMode) pg.setConfigOptions(imageAxisOrder=origMode)
@pytest.mark.skipif(six.PY2 and pg.Qt.QT_LIB in {"PySide", "PyQt4"} and platform.system() == "Linux", reason=reason)
def test_getArrayRegion_axisorder(): def test_getArrayRegion_axisorder():
test_getArrayRegion(transpose=True) test_getArrayRegion(transpose=True)