Skip to content

Commit

Permalink
Merge pull request #5472 from ales-erjavec/fixes/orange-canvas-core-m…
Browse files Browse the repository at this point in the history
…in-req

[FIX] Bump orange-canvas-core minimum version requirement
  • Loading branch information
PrimozGodec authored Jun 8, 2021
2 parents a78eaf3 + 0434bc5 commit 0298264
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
Empty file added Orange/canvas/tests/__init__.py
Empty file.
13 changes: 13 additions & 0 deletions Orange/canvas/tests/test_mainwindow.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# pylint: disable=all
from unittest.mock import patch

from Orange.canvas.mainwindow import MainWindow, OUserSettingsDialog
from Orange.widgets.tests.base import GuiTest


class TestMainWindow(GuiTest):
def test_settings_dialog(self):
mw = MainWindow()
with patch.object(OUserSettingsDialog, "exec", lambda self: 0), \
patch.object(OUserSettingsDialog, "show", lambda self: None):
mw.open_canvas_settings()
2 changes: 1 addition & 1 deletion requirements-gui.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
orange-canvas-core>=0.1.19,<0.2a
orange-canvas-core>=0.1.21,<0.2a
orange-widget-base>=4.13.0

PyQt5>=5.12,!=5.15.1 # 5.15.1 skipped because of QTBUG-87057 - affects select columns
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ commands_pre =
# freeze environment
pip freeze
commands =
coverage run {toxinidir}/quietunittest.py Orange.tests Orange.widgets.tests
coverage run {toxinidir}/quietunittest.py Orange.tests Orange.widgets.tests Orange.canvas.tests
coverage run {toxinidir}/quietunittest.py discover Orange.canvas.tests
coverage combine
coverage report

Expand Down

0 comments on commit 0298264

Please sign in to comment.