diff --git a/azure-test-template.yml b/azure-test-template.yml index bc1a16df..7ca6ba45 100644 --- a/azure-test-template.yml +++ b/azure-test-template.yml @@ -100,12 +100,6 @@ jobs: conda config --prepend channels conda-forge fi 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 else pip install $(qt.bindings) numpy scipy pyopengl h5py six diff --git a/pyqtgraph/graphicsItems/tests/test_ROI.py b/pyqtgraph/graphicsItems/tests/test_ROI.py index 33a18217..2fc61d11 100644 --- a/pyqtgraph/graphicsItems/tests/test_ROI.py +++ b/pyqtgraph/graphicsItems/tests/test_ROI.py @@ -4,11 +4,15 @@ import pytest import pyqtgraph as pg from pyqtgraph.Qt import QtCore, QtTest from pyqtgraph.tests import assertImageApproved, mouseMove, mouseDrag, mouseClick, TransposedImageItem, resizeWindow - +import pytest +import platform +import six 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): pr = pg.PolyLineROI([[0, 0], [27, 0], [0, 28]], closed=True) pr.setPos(1, 1) @@ -33,7 +37,7 @@ def test_getArrayRegion(transpose=False): finally: 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(): test_getArrayRegion(transpose=True)