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

Skip tests involving loadUi with pyside2 5.14

Browse Source
This commit is contained in:
Ogi 2020-02-24 23:00:42 -08:00
parent 428af4950d
commit 19ae94765f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/test_examples.py
View File

@ -1,8 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import print_function, division, absolute_import from __future__ import print_function, division, absolute_import
from pyqtgraph import Qt
from . import utils from . import utils
from collections import namedtuple from collections import namedtuple
from pyqtgraph import Qt
import errno import errno
import importlib import importlib
import itertools import itertools
@ -150,6 +150,7 @@ conditionalExamples = {
) )
} }
@pytest.mark.skipif(Qt.QT_LIB == "PySide2" and "Qt.QtVersion.startswith('5.14')", reason="new PySide2 doesn't have loadUi functionality")
@pytest.mark.parametrize( @pytest.mark.parametrize(
"frontend, f", "frontend, f",
[ [

2
pyqtgraph/tests/test_qt.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
import pyqtgraph as pg import pyqtgraph as pg
import gc, os import gc, os
import pytest import pytest
@ -14,6 +15,7 @@ def test_isQObjectAlive():
@pytest.mark.skipif(pg.Qt.QT_LIB == 'PySide', reason='pysideuic does not appear to be ' @pytest.mark.skipif(pg.Qt.QT_LIB == 'PySide', reason='pysideuic does not appear to be '
'packaged with conda') 'packaged with conda')
@pytest.mark.skipif(pg.Qt.QT_LIB == "PySide2" and "pg.Qt.QtVersion.startswith('5.14')", reason="new PySide2 doesn't have loadUi functionality")
def test_loadUiType(): def test_loadUiType():
path = os.path.dirname(__file__) path = os.path.dirname(__file__)
formClass, baseClass = pg.Qt.loadUiType(os.path.join(path, 'uictest.ui')) formClass, baseClass = pg.Qt.loadUiType(os.path.join(path, 'uictest.ui'))