Skip to content

Commit 1f666da

Browse files
committed
[WIP] CI: Test with PyQt6
1 parent f6b51e5 commit 1f666da

File tree

3 files changed

+35
-7
lines changed

3 files changed

+35
-7
lines changed

.github/workflows/test.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ jobs:
4949
python-version: 3.7
5050
tox_env: orange-oldest
5151
name: Oldest dependencies
52+
- os: ubuntu-20.04
53+
python-version: 3.9
54+
tox_env: pyqt6
55+
name: PyQt6
56+
5257

5358
services:
5459
postgres:
@@ -77,7 +82,7 @@ jobs:
7782
python-version: ${{ matrix.python-version }}
7883

7984
- name: Install linux system dependencies
80-
run: sudo apt-get install -y libxkbcommon-x11-0
85+
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
8186

8287
- name: Install Tox
8388
run: |
@@ -118,6 +123,14 @@ jobs:
118123
python-version: 3.8
119124
tox_env: orange-latest
120125
name: Latest
126+
- os: windows-latest
127+
python-version: 3.9
128+
tox_env: pyqt6
129+
name: PyQt6
130+
- os: macos-10.15
131+
python-version: 3.9
132+
tox_env: pyqt6
133+
name: PyQt6
121134

122135
steps:
123136
- uses: actions/checkout@v2

requirements-gui.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
orange-canvas-core>=0.1.24,<0.2a
1+
orange-canvas-core>=0.1.26,<0.2a
22
orange-widget-base>=4.16.1
33

4-
AnyQt>=0.0.13
4+
AnyQt>=0.1.0
55

66
# ignore pyqtgraph 0.12.4 due to https://github.com/pyqtgraph/pyqtgraph/issues/2237
77
pyqtgraph>=0.11.1,!=0.12.4

tox.ini

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,18 @@ setenv =
3030
deps =
3131
pyqt5==5.12.*
3232
pyqtwebengine==5.12.*
33+
https://github.com/ales-erjavec/orange-widget-base/archive/refs/heads/pyqt6.zip#egg=orange-widget-base
3334
-r {toxinidir}/requirements-opt.txt
3435
coverage
3536
psycopg2-binary
3637
# no wheels for mac
3738
pymssql<3.0;platform_system!='Darwin' and python_version<'3.8'
3839
latest: https://github.com/pyqtgraph/pyqtgraph/archive/refs/heads/master.zip#egg=pyqtgraph
3940
latest: https://github.com/biolab/orange-canvas-core/archive/refs/heads/master.zip#egg=orange-canvas-core
40-
latest: https://github.com/biolab/orange-widget-base/archive/refs/heads/master.zip#egg=orange-widget-base
41-
oldest: orange-canvas-core==0.1.24
42-
oldest: orange-widget-base==4.16.1
43-
oldest: AnyQt==0.0.13
41+
latest: https://github.com/ales-erjavec/orange-widget-base/archive/refs/heads/pyqt6.zip#egg=orange-widget-base
42+
oldest: orange-canvas-core==0.1.26
43+
oldest: https://github.com/ales-erjavec/orange-widget-base/archive/refs/heads/pyqt6.zip#egg=orange-widget-base
44+
oldest: AnyQt==0.1.0
4445
oldest: pyqtgraph==0.11.1
4546
oldest: matplotlib==2.2.5
4647
oldest: qtconsole==4.7.2
@@ -79,6 +80,20 @@ commands =
7980
coverage combine
8081
coverage report
8182

83+
[testenv:pyqt6]
84+
changedir =
85+
{envsitepackagesdir}
86+
setenv =
87+
QT_API=PyQt6
88+
ANYQT_HOOK_DENY=pyqt5
89+
deps =
90+
PyQt6==6.2.*
91+
PyQt6-WebEngine==6.2.*
92+
https://github.com/biolab/orange-widget-base/archive/refs/heads/master.zip#egg=orange-widget-base
93+
94+
commands =
95+
python -m unittest Orange.widgets.tests
96+
8297
[testenv:add-ons]
8398
deps =
8499
{[testenv]deps}

0 commit comments

Comments
 (0)