Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CI] Add Python 3.12 to CI tests #287

Merged
merged 3 commits into from
Oct 20, 2023
Merged

[CI] Add Python 3.12 to CI tests #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0e4ee8
ci: Add Python 3.12 to test matrices
ales-erjavec Oct 18, 2023
f85c05a
windowlistmanager: Fix stack overflow error on windows
ales-erjavec Oct 19, 2023
8e8b5a9
test_main: Change test name that shadows a previous test
ales-erjavec Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions .github/workflows/run-tests-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ jobs:
matrix:
include:
# Linux
- os: ubuntu-20.04
python-version: 3.7
test-env: "PyQt5~=5.9.2 qasync<0.19.0"

- os: ubuntu-20.04
python-version: 3.8
test-env: "PyQt5~=5.12.0"
Expand Down Expand Up @@ -54,6 +50,10 @@ jobs:
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
extra-system-packages: "glibc-tools"

- os: ubuntu-22.04
python-version: "3.12"
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"
extra-system-packages: "glibc-tools"

# macOS
- os: macos-11
Expand All @@ -80,11 +80,11 @@ jobs:
python-version: "3.11"
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"

# Windows
- os: windows-2019
python-version: 3.7
test-env: "PyQt5~=5.9.2"
- os: macos-12
python-version: "3.12"
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"

# Windows
- os: windows-2019
python-version: 3.8
test-env: "PyQt5~=5.12.0"
Expand All @@ -109,6 +109,10 @@ jobs:
python-version: "3.11"
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"

- os: windows-2019
python-version: "3.12"
test-env: "PyQt6~=6.5.0 PyQt6-Qt6~=6.5.0"

steps:
- uses: actions/checkout@v3
- name: Setup Python
Expand Down
2 changes: 1 addition & 1 deletion orangecanvas/application/tests/test_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def test_run(self):
self.assertEqual(res, 42)

@with_patched_main_application
def test_run(self):
def test_run_with_file(self):
m = Main()
with patch.object(self.app, "exec", lambda: 42), \
patch.object(CanvasMainWindow, "open_scheme_file", Mock()), \
Expand Down
2 changes: 1 addition & 1 deletion orangecanvas/gui/windowlistmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def instance() -> "WindowListManager":
def __init__(self, *args, **kwargs):
if self.__instance is not None:
raise RuntimeError
WindowListManager.__instance = self
super().__init__(*args, **kwargs)
WindowListManager.__instance = self
self.__group = QActionGroup(
self, objectName="window-list-manager-action-group"
)
Expand Down