diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml index ea19f6fb..a85d71c9 100644 --- a/.github/workflows/ci_workflows.yml +++ b/.github/workflows/ci_workflows.yml @@ -58,19 +58,20 @@ jobs: # Test a few configurations on macOS - macos: py38-test-pyqt514-all - macos: py310-test-pyqt515 - - macos: py310-test-pyqt64 - - macos: py311-test-pyqt515 + - macos: py311-test-pyqt65 + - macos: py312-test-pyqt67 # Test some configurations on Windows - windows: py38-test-pyqt514 - windows: py310-test-pyqt63 - windows: py311-test-pyqt65 + - windows: py312-test-pyqt66 # Test against latest developer versions of some packages - linux: py310-test-pyqt515-dev-all - linux: py311-test-pyqt64-dev - linux: py312-test-pyqt515-dev - - linux: py312-test-pyqt66-dev-all + - linux: py312-test-pyqt67-dev-all allowed_failures: needs: initial_checks diff --git a/glue_qt/conftest.py b/glue_qt/conftest.py index 745d0601..8a19b0c6 100644 --- a/glue_qt/conftest.py +++ b/glue_qt/conftest.py @@ -7,7 +7,7 @@ try: from qtpy import PYSIDE2, PYSIDE6 except Exception: - PYSIDE2 = False + PYSIDE2 = PYSIDE6 = False from glue.config import CFG_DIR as CFG_DIR_ORIG @@ -105,7 +105,7 @@ def pytest_unconfigure(config): # objgraph.show_most_common_types(limit=100) -# With PySide2, tests can fail in a non-deterministic way on a teardown error +# With PySide2/6, tests can fail in a non-deterministic way on a teardown error # or with the following error: # # AttributeError: 'PySide2.QtGui.QStandardItem' object has no attribute '...' diff --git a/tox.ini b/tox.ini index 0a6021ef..ec08bed2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{38,39,310,311,312}-{codestyle,test,docs}-{pyqt514,pyqt515,pyside514,pyside515,pyqt63,pyqt64,pyqt65,pyqt63,pyside66}-all-{dev,legacy} + py{38,39,310,311,312}-{codestyle,test,docs}-{pyqt514,pyqt515,pyside514,pyside515,pyqt63,pyqt64,pyqt66,pyqt67,pyqt65,pyqt63,pyside66}-all-{dev,legacy} requires = pip >= 18.0 setuptools >= 30.3.0 @@ -31,6 +31,8 @@ deps = pyqt65: PyQt6==6.5.* pyqt66: PyQt6-Qt6==6.6.* pyqt66: PyQt6==6.6.* + pyqt67: PyQt6-Qt6==6.7.* + pyqt67: PyQt6==6.7.* pyside514: PySide2==5.14.* pyside515: PySide2==5.15.* pyside63: PySide6==6.3.*