diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 389fc2c6..73465177 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -27,7 +27,7 @@ jobs: fail-fast: false matrix: platform: [ubuntu-latest, windows-latest, macos-13] - python-version: ["3.8", "3.9", "3.10", "3.11"] + python-version: ["3.9", "3.10", "3.11", "3.12"] backend: [pyqt5, pyside2, pyqt6] exclude: # Abort (core dumped) on linux pyqt6, unknown reason @@ -36,30 +36,32 @@ jobs: # lack of wheels for pyside2/py3.11 - python-version: "3.11" backend: pyside2 + - python-version: "3.12" + backend: pyside2 + - python-version: "3.12" + backend: pyqt5 include: - python-version: "3.10" platform: macos-latest - backend: pyside6 + backend: "'pyside6<6.8'" - python-version: "3.11" platform: macos-latest - backend: pyside6 + backend: "'pyside6<6.8'" - python-version: "3.10" platform: windows-latest - backend: pyside6 - - python-version: "3.11" - platform: windows-latest - backend: pyside6 + backend: "'pyside6<6.8'" - python-version: "3.12" - platform: macos-latest - backend: pyqt6 + platform: windows-latest + backend: "'pyside6<6.8'" + # legacy Qt - - python-version: 3.8 + - python-version: 3.9 platform: ubuntu-latest backend: "pyqt5==5.12.*" - - python-version: 3.8 + - python-version: 3.9 platform: ubuntu-latest backend: "pyqt5==5.13.*" - - python-version: 3.8 + - python-version: 3.9 platform: ubuntu-latest backend: "pyqt5==5.14.*" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 507db8f3..357c27e8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,19 +5,19 @@ ci: repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.7 + rev: v0.6.9 hooks: - id: ruff args: [--fix, --unsafe-fixes] - id: ruff-format - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.18 + rev: v0.20.2 hooks: - id: validate-pyproject - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.10.0 + rev: v1.11.2 hooks: - id: mypy exclude: tests|examples diff --git a/examples/demo_widget.py b/examples/demo_widget.py index 1fa46a94..4756c191 100644 --- a/examples/demo_widget.py +++ b/examples/demo_widget.py @@ -6,7 +6,7 @@ # patch for Qt 5.15 on macos >= 12 os.environ["USE_MAC_SLIDER_PATCH"] = "1" -from superqt import QRangeSlider # noqa +from superqt import QRangeSlider QSS = """ QSlider { diff --git a/pyproject.toml b/pyproject.toml index 7e779b9f..92e6eccc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -66,7 +66,7 @@ pyside2 = ["pyside2"] # https://github.com/pyapp-kit/superqt/pull/177 # https://github.com/pyapp-kit/superqt/pull/164 # https://bugreports.qt.io/browse/PYSIDE-2627 -pyside6 = ["pyside6 !=6.5.0,!=6.5.1,!=6.6.2"] +pyside6 = ["pyside6 !=6.5.0,!=6.5.1,!=6.6.2,<6.8"] pyqt5 = ["pyqt5"] pyqt6 = ["pyqt6<6.7"] font-fa5 = ["fonticon-fontawesome5"] diff --git a/tests/test_ensure_thread.py b/tests/test_ensure_thread.py index e35afeef..4a90f130 100644 --- a/tests/test_ensure_thread.py +++ b/tests/test_ensure_thread.py @@ -162,7 +162,7 @@ def test_names(qapp): signature = inspect.signature(ob.check_object_thread_return_future) assert len(signature.parameters) == 1 assert next(iter(signature.parameters.values())).name == "a" - assert next(iter(signature.parameters.values())).annotation == int + assert next(iter(signature.parameters.values())).annotation is int assert ob.check_main_thread_return.__name__ == "check_main_thread_return"