Skip to content

Commit 0298264

Browse files
authored
Merge pull request #5472 from ales-erjavec/fixes/orange-canvas-core-min-req
[FIX] Bump orange-canvas-core minimum version requirement
2 parents a78eaf3 + 0434bc5 commit 0298264

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

Orange/canvas/tests/__init__.py

Whitespace-only changes.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# pylint: disable=all
2+
from unittest.mock import patch
3+
4+
from Orange.canvas.mainwindow import MainWindow, OUserSettingsDialog
5+
from Orange.widgets.tests.base import GuiTest
6+
7+
8+
class TestMainWindow(GuiTest):
9+
def test_settings_dialog(self):
10+
mw = MainWindow()
11+
with patch.object(OUserSettingsDialog, "exec", lambda self: 0), \
12+
patch.object(OUserSettingsDialog, "show", lambda self: None):
13+
mw.open_canvas_settings()

requirements-gui.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
orange-canvas-core>=0.1.19,<0.2a
1+
orange-canvas-core>=0.1.21,<0.2a
22
orange-widget-base>=4.13.0
33

44
PyQt5>=5.12,!=5.15.1 # 5.15.1 skipped because of QTBUG-87057 - affects select columns

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ commands_pre =
4545
# freeze environment
4646
pip freeze
4747
commands =
48-
coverage run {toxinidir}/quietunittest.py Orange.tests Orange.widgets.tests
48+
coverage run {toxinidir}/quietunittest.py Orange.tests Orange.widgets.tests Orange.canvas.tests
49+
coverage run {toxinidir}/quietunittest.py discover Orange.canvas.tests
4950
coverage combine
5051
coverage report
5152

0 commit comments

Comments
 (0)