Skip to content

Commit 44a6271

Browse files
authored
Merge pull request #4047 from robertcv/fix/owtestscore_progressbar
[FIX] Deprecated processEvents argument in Test&Score
2 parents 297d32d + dfb7b2d commit 44a6271

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Orange/widgets/evaluate/owtestlearners.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ def migrate_settings(cls, settings_, version):
677677

678678
@Slot(float)
679679
def setProgressValue(self, value):
680-
self.progressBarSet(value, processEvents=False)
680+
self.progressBarSet(value)
681681

682682
def __update(self):
683683
self.__needupdate = False
@@ -821,7 +821,7 @@ def ondone(_):
821821
task.future = self.__executor.submit(testfunc)
822822
task.future.add_done_callback(ondone)
823823

824-
self.progressBarInit(processEvents=None)
824+
self.progressBarInit()
825825
self.setBlocking(True)
826826
self.setStatusMessage("Running")
827827

@@ -838,7 +838,7 @@ def __task_complete(self, task):
838838
return
839839

840840
self.setBlocking(False)
841-
self.progressBarFinished(processEvents=None)
841+
self.progressBarFinished()
842842
self.setStatusMessage("")
843843
result = task.future
844844
assert result.done()

Orange/widgets/evaluate/tests/test_owtestlearners.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# pylint: disable=missing-docstring
22
# pylint: disable=protected-access
33
import unittest
4+
import warnings
45

56
import numpy as np
67
from AnyQt.QtCore import Qt
@@ -382,6 +383,14 @@ def test_scores_cross_validation(self):
382383
OWTestLearners.KFold, 0),
383384
(0.8, 0.5, 0.5, 0.5, 0.5))))
384385

386+
def test_no_pregressbar_warning(self):
387+
data = Table("iris")[::15]
388+
389+
with warnings.catch_warnings(record=True) as w:
390+
self.send_signal(self.widget.Inputs.train_data, data)
391+
self.send_signal(self.widget.Inputs.learner, MajorityLearner(), 0)
392+
assert not w
393+
385394

386395
class TestHelpers(unittest.TestCase):
387396
def test_results_one_vs_rest(self):

0 commit comments

Comments
 (0)