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: Try PySide6 on conda #378

Merged
merged 5 commits into from
Oct 21, 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
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ jobs:
special-invocation: 'xvfb-run --auto-servernum ' # Needed for GUI tests to work
- python-version: '3.10'
skip-pyside2: true # Skip Pyside2 on all Python 3.10 builds until it supports it
- use-conda: 'Yes' # No conda packages yet for Qt6
- use-conda: 'Yes' # No PyQt6 conda packages yet
skip-pyqt6: true
skip-pyside6: true
- os: windows-latest
python-version: '3.10'
use-conda: 'No'
Expand All @@ -59,6 +58,11 @@ jobs:
use-conda: 'Yes'
pyqt5-qt-version: '5.9'
pyqt6-qt-version: '6.2'
skip-pyside6: true # test hangs
- os: windows-latest
python-version: '3.10'
use-conda: 'Yes'
skip-pyside6: true # test hangs
- os: macos-latest
python-version: '3.7'
use-conda: 'No'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ if [ "$USE_CONDA" = "Yes" ]; then
conda install -q qt=${PYQT5_QT_VERSION:-"5.12"} pyqt=${PYQT5_VERSION:-"5"}
elif [ "${1}" = "pyside2" ]; then
conda install -q qt=${PYSIDE2_QT_VERSION:-"5.12"} pyside2=${PYSIDE2_VERSION:-"5"}
elif [ "${1}" = "pyside6" ]; then
conda install -q pyside6=${PYSIDE6_VERSION:-"6.4"}
else
exit 1
fi
Expand Down
1 change: 1 addition & 0 deletions qtpy/QtCore.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,6 @@
QThread.exec_ = lambda self, *args, **kwargs: self.exec(*args, **kwargs)
QTextStreamManipulator.exec_ = lambda self, *args, **kwargs: self.exec(*args, **kwargs)

QLibraryInfo.location = QLibraryInfo.path
else:
raise QtBindingsNotFoundError()
2 changes: 1 addition & 1 deletion qtpy/tests/test_qtdesigner.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@pytest.mark.skipif(PYSIDE2, reason="QtDesigner is not available in PySide2")
def test_qtdesigner():
"""Test the qtpy.QtDesigner namespace."""
from qtpy import QtDesigner
QtDesigner = pytest.importorskip("qtpy.QtDesigner")

assert QtDesigner.QAbstractExtensionFactory is not None
assert QtDesigner.QAbstractExtensionManager is not None
Expand Down
2 changes: 1 addition & 1 deletion qtpy/tests/test_qtsensors.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

def test_qtsensors():
"""Test the qtpy.QtSensors namespace"""
from qtpy import QtSensors
QtSensors = pytest.importorskip("qtpy.QtSensors")

assert QtSensors.QAccelerometer is not None
assert QtSensors.QAccelerometerFilter is not None
Expand Down
2 changes: 1 addition & 1 deletion qtpy/tests/test_qtserialport.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@pytest.mark.skipif(PYSIDE2, reason="Not available in CI")
def test_qtserialport():
"""Test the qtpy.QtSerialPort namespace"""
from qtpy import QtSerialPort
QtSerialPort = pytest.importorskip("qtpy.QtSerialPort")

assert QtSerialPort.QSerialPort is not None
assert QtSerialPort.QSerialPortInfo is not None
2 changes: 1 addition & 1 deletion qtpy/tests/test_qtsvg.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

def test_qtsvg():
"""Test the qtpy.QtSvg namespace"""
from qtpy import QtSvg
QtSvg = pytest.importorskip("qtpy.QtSvg")

if not (PYSIDE6 or PYQT6):
assert QtSvg.QGraphicsSvgItem is not None
Expand Down