Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Enable more qt6 tests #380

Merged
merged 1 commit into from
Oct 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
shell: bash
run: |
sudo apt update
sudo apt install libpulse-dev libegl1-mesa libopengl0
sudo apt install libpulse-dev libegl1-mesa libopengl0 gstreamer1.0-gl
- name: Install Conda
uses: conda-incubator/setup-miniconda@v2
with:
Expand Down
1 change: 0 additions & 1 deletion qtpy/tests/test_qt3danimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from qtpy import PYQT5, PYSIDE2


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
def test_qt3danimation():
"""Test the qtpy.Qt3DAnimation namespace"""
Qt3DAnimation = pytest.importorskip("qtpy.Qt3DAnimation")
Expand Down
9 changes: 3 additions & 6 deletions qtpy/tests/test_qtmultimediawidgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,12 @@
from qtpy.tests.utils import using_conda


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
@pytest.mark.skipif(
using_conda(), reason="Conda packages don't seem to include QtMultimedia"
)
def test_qtmultimediawidgets():
"""Test the qtpy.QtMultimediaWidgets namespace"""
from qtpy import QtMultimediaWidgets

assert QtMultimediaWidgets.QCameraViewfinder is not None
if PYQT5 or PYSIDE2:
assert QtMultimediaWidgets.QCameraViewfinder is not None
# assert QtMultimediaWidgets.QVideoWidgetControl is not None
assert QtMultimediaWidgets.QGraphicsVideoItem is not None
assert QtMultimediaWidgets.QVideoWidget is not None
# assert QtMultimediaWidgets.QVideoWidgetControl is not None
1 change: 0 additions & 1 deletion qtpy/tests/test_qtpositioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from qtpy import PYQT5, PYSIDE2


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
def test_qtpositioning():
"""Test the qtpy.QtPositioning namespace"""
from qtpy import QtPositioning
Expand Down
5 changes: 2 additions & 3 deletions qtpy/tests/test_qtqml.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import pytest
from qtpy import PYQT5, PYSIDE2
from qtpy import PYQT5, PYSIDE2, PYSIDE6


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
def test_qtqml():
"""Test the qtpy.QtQml namespace"""
from qtpy import QtQml
Expand All @@ -22,7 +21,7 @@ def test_qtqml():
assert QtQml.QQmlFileSelector is not None
assert QtQml.QQmlIncubationController is not None
assert QtQml.QQmlIncubator is not None
if not PYSIDE2:
if not (PYSIDE2 or PYSIDE6):
# https://wiki.qt.io/Qt_for_Python_Missing_Bindings#QtQml
assert QtQml.QQmlListProperty is not None
assert QtQml.QQmlListReference is not None
Expand Down
6 changes: 3 additions & 3 deletions qtpy/tests/test_qtquick.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from qtpy import PYQT5, PYSIDE2


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
def test_qtquick():
"""Test the qtpy.QtQuick namespace"""
from qtpy import QtQuick
Expand Down Expand Up @@ -32,11 +31,12 @@ def test_qtquick():
assert QtQuick.QQuickTextureFactory is not None
assert QtQuick.QQuickView is not None
assert QtQuick.QQuickWindow is not None
assert QtQuick.QSGAbstractRenderer is not None
if PYQT5 or PYSIDE2:
assert QtQuick.QSGAbstractRenderer is not None
assert QtQuick.QSGEngine is not None
assert QtQuick.QSGBasicGeometryNode is not None
assert QtQuick.QSGClipNode is not None
assert QtQuick.QSGDynamicTexture is not None
assert QtQuick.QSGEngine is not None
assert QtQuick.QSGGeometry is not None
assert QtQuick.QSGGeometryNode is not None
assert QtQuick.QSGMaterialType is not None
Expand Down
1 change: 0 additions & 1 deletion qtpy/tests/test_qtquickwidgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from qtpy import PYQT5, PYSIDE2


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
def test_qtquickwidgets():
"""Test the qtpy.QtQuickWidgets namespace"""
from qtpy import QtQuickWidgets
Expand Down
1 change: 0 additions & 1 deletion qtpy/tests/test_qtwebchannel.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from qtpy import PYQT5, PYSIDE2


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
def test_qtwebchannel():
"""Test the qtpy.QtWebChannel namespace"""
from qtpy import QtWebChannel
Expand Down
1 change: 0 additions & 1 deletion qtpy/tests/test_qtwebsockets.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from qtpy import PYQT5, PYSIDE2


@pytest.mark.skipif(not (PYQT5 or PYSIDE2), reason="Only available in Qt5 bindings")
def test_qtwebsockets():
"""Test the qtpy.QtWebSockets namespace"""
from qtpy import QtWebSockets
Expand Down