Skip to content

Commit 1681d5e

Browse files
authored
Merge pull request #287 from ales-erjavec/ci/python3.12
[CI] Add Python 3.12 to CI tests
2 parents 577aa0c + 8e8b5a9 commit 1681d5e

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

.github/workflows/run-tests-workflow.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
matrix:
1818
include:
1919
# Linux
20-
- os: ubuntu-20.04
21-
python-version: 3.7
22-
test-env: "PyQt5~=5.9.2 qasync<0.19.0"
23-
2420
- os: ubuntu-20.04
2521
python-version: 3.8
2622
test-env: "PyQt5~=5.12.0"
@@ -54,6 +50,10 @@ jobs:
5450
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
5551
extra-system-packages: "glibc-tools"
5652

53+
- os: ubuntu-22.04
54+
python-version: "3.12"
55+
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
56+
extra-system-packages: "glibc-tools"
5757

5858
# macOS
5959
- os: macos-11
@@ -80,11 +80,11 @@ jobs:
8080
python-version: "3.11"
8181
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
8282

83-
# Windows
84-
- os: windows-2019
85-
python-version: 3.7
86-
test-env: "PyQt5~=5.9.2"
83+
- os: macos-12
84+
python-version: "3.12"
85+
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
8786

87+
# Windows
8888
- os: windows-2019
8989
python-version: 3.8
9090
test-env: "PyQt5~=5.12.0"
@@ -109,6 +109,10 @@ jobs:
109109
python-version: "3.11"
110110
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
111111

112+
- os: windows-2019
113+
python-version: "3.12"
114+
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
115+
112116
steps:
113117
- uses: actions/checkout@v3
114118
- name: Setup Python

orangecanvas/application/tests/test_main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def test_run(self):
123123
self.assertEqual(res, 42)
124124

125125
@with_patched_main_application
126-
def test_run(self):
126+
def test_run_with_file(self):
127127
m = Main()
128128
with patch.object(self.app, "exec", lambda: 42), \
129129
patch.object(CanvasMainWindow, "open_scheme_file", Mock()), \

orangecanvas/gui/windowlistmanager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ def instance() -> "WindowListManager":
3333
def __init__(self, *args, **kwargs):
3434
if self.__instance is not None:
3535
raise RuntimeError
36-
WindowListManager.__instance = self
3736
super().__init__(*args, **kwargs)
37+
WindowListManager.__instance = self
3838
self.__group = QActionGroup(
3939
self, objectName="window-list-manager-action-group"
4040
)

0 commit comments

Comments
 (0)