From 7a736961c7e777b2797a90e696d59d4280166b01 Mon Sep 17 00:00:00 2001 From: Ales Erjavec Date: Thu, 10 Mar 2022 12:27:33 +0100 Subject: [PATCH] CI: Test with PyQt6 --- .github/workflows/test.yml | 15 ++++++++++++++- requirements-gui.txt | 4 ++-- tox.ini | 21 ++++++++++++++++++--- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c4309d0d55..58f5cdc2252 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,6 +49,11 @@ jobs: python-version: 3.7 tox_env: orange-oldest name: Oldest dependencies + - os: ubuntu-20.04 + python-version: 3.9 + tox_env: pyqt6 + name: PyQt6 + services: postgres: @@ -77,7 +82,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install linux system dependencies - run: sudo apt-get install -y libxkbcommon-x11-0 + run: sudo apt-get install -y libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 libegl1-mesa - name: Install Tox run: | @@ -118,6 +123,14 @@ jobs: python-version: 3.8 tox_env: orange-latest name: Latest + - os: windows-latest + python-version: 3.9 + tox_env: pyqt6 + name: PyQt6 + - os: macos-10.15 + python-version: 3.9 + tox_env: pyqt6 + name: PyQt6 steps: - uses: actions/checkout@v2 diff --git a/requirements-gui.txt b/requirements-gui.txt index 0533095c7e2..61a44d798d9 100644 --- a/requirements-gui.txt +++ b/requirements-gui.txt @@ -1,7 +1,7 @@ -orange-canvas-core>=0.1.24,<0.2a +orange-canvas-core>=0.1.26,<0.2a orange-widget-base>=4.17.0 -AnyQt>=0.0.14 +AnyQt>=0.1.0 # ignore pyqtgraph 0.12.4 due to https://github.com/pyqtgraph/pyqtgraph/issues/2237 pyqtgraph>=0.12.2,!=0.12.4 diff --git a/tox.ini b/tox.ini index 8f1584a45fd..b7c3ce23a37 100644 --- a/tox.ini +++ b/tox.ini @@ -38,9 +38,9 @@ deps = latest: https://github.com/pyqtgraph/pyqtgraph/archive/refs/heads/master.zip#egg=pyqtgraph latest: https://github.com/biolab/orange-canvas-core/archive/refs/heads/master.zip#egg=orange-canvas-core latest: https://github.com/biolab/orange-widget-base/archive/refs/heads/master.zip#egg=orange-widget-base - oldest: orange-canvas-core==0.1.24 - oldest: orange-widget-base==4.16.1 - oldest: AnyQt==0.0.13 + oldest: orange-canvas-core==0.1.26 + oldest: orange-widget-base==4.17.0 + oldest: AnyQt==0.1.0 oldest: pyqtgraph==0.11.1 oldest: matplotlib==2.2.5 oldest: qtconsole==4.7.2 @@ -79,6 +79,21 @@ commands = coverage combine coverage report +[testenv:pyqt6] +changedir = + {envsitepackagesdir} +setenv = + QT_API=PyQt6 + ANYQT_HOOK_DENY=pyqt5 +deps = + PyQt6==6.2.* + PyQt6-Qt6==6.2.* + PyQt6-WebEngine==6.2.* + PyQt6-WebEngine-Qt6==6.2.* + +commands = + python -m unittest Orange.widgets.tests + [testenv:add-ons] deps = {[testenv]deps}