From a740fdc0d64583ef38d5b5ff5dd2c2b62a52dd1c Mon Sep 17 00:00:00 2001 From: janezd Date: Fri, 13 Dec 2024 14:05:52 +0100 Subject: [PATCH 1/2] Import localization from orangecanvas to avoid depending on Qt --- Orange/widgets/evaluate/owpredictions.py | 2 +- Orange/widgets/utils/localization/__init__.py | 2 +- i18n/trubar-config.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Orange/widgets/evaluate/owpredictions.py b/Orange/widgets/evaluate/owpredictions.py index edbc3ad476c..d0167edee2f 100644 --- a/Orange/widgets/evaluate/owpredictions.py +++ b/Orange/widgets/evaluate/owpredictions.py @@ -16,7 +16,6 @@ QModelIndex, pyqtSignal, QTimer, QItemSelectionModel, QItemSelection) -from orangecanvas.utils.localization import pl from orangewidget.utils.itemmodels import AbstractSortTableModel from orangewidget.utils.signals import LazyValue @@ -39,6 +38,7 @@ from Orange.widgets.utils.state_summary import format_summary_details from Orange.widgets.utils.colorpalettes import LimitedDiscretePalette from Orange.widgets.utils.itemdelegates import TableDataDelegate +from Orange.widgets.utils.localization import pl # Input slot for the Predictors channel PredictorSlot = NamedTuple( diff --git a/Orange/widgets/utils/localization/__init__.py b/Orange/widgets/utils/localization/__init__.py index 0640b94602c..382ab4993a6 100644 --- a/Orange/widgets/utils/localization/__init__.py +++ b/Orange/widgets/utils/localization/__init__.py @@ -1,3 +1,3 @@ -from orangecanvas.utils.localization import pl +from orangecanvas.localization import pl __all__ = ['pl'] diff --git a/i18n/trubar-config.yaml b/i18n/trubar-config.yaml index 0479f418995..46595f963a9 100644 --- a/i18n/trubar-config.yaml +++ b/i18n/trubar-config.yaml @@ -5,9 +5,9 @@ languages: si: name: Slovenščina international-name: Slovenian - auto-import: from orangecanvas.utils.localization.si import plsi, plsi_sz, z_besedo # pylint: disable=wrong-import-order + auto-import: from orangecanvas.localization.si import plsi, plsi_sz, z_besedo # pylint: disable=wrong-import-order auto-import: |2 - from orangecanvas.utils.localization import Translator # pylint: disable=wrong-import-order + from orangecanvas.localization import Translator # pylint: disable=wrong-import-order _tr = Translator("Orange", "biolab.si", "Orange") del Translator encoding: "utf-8" \ No newline at end of file From 74f82826414e4220a77862cc7545a3df23602ae4 Mon Sep 17 00:00:00 2001 From: Marko Toplak Date: Mon, 16 Dec 2024 14:21:14 +0100 Subject: [PATCH 2/2] require orange-canvas-core==0.2.5 --- conda-recipe/meta.yaml | 2 +- requirements-gui.txt | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 3ad1068b99f..b82ed663e1f 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -32,7 +32,7 @@ requirements: run: - python # GUI requirements - - orange-canvas-core >=0.2.4,<0.3a + - orange-canvas-core >=0.2.5,<0.3a - orange-widget-base >=4.25.0 - anyqt >=0.2.0 - pyqt >=5.12,!=5.15.1,<6.0 diff --git a/requirements-gui.txt b/requirements-gui.txt index 0172b107eef..a702fd6bcc7 100644 --- a/requirements-gui.txt +++ b/requirements-gui.txt @@ -1,4 +1,4 @@ -orange-canvas-core>=0.2.4,<0.3a +orange-canvas-core>=0.2.5,<0.3a orange-widget-base>=4.25.0 AnyQt>=0.2.0 diff --git a/tox.ini b/tox.ini index d96e0f062ee..fbaf8958c37 100644 --- a/tox.ini +++ b/tox.ini @@ -36,7 +36,7 @@ deps = latest: https://github.com/biolab/orange-canvas-core/archive/refs/heads/master.zip#egg=orange-canvas-core latest: https://github.com/biolab/orange-widget-base/archive/refs/heads/master.zip#egg=orange-widget-base # GUI requirements - oldest: orange-canvas-core==0.2.4 + oldest: orange-canvas-core==0.2.5 oldest: orange-widget-base==4.25.0 oldest: AnyQt==0.2.0 oldest: matplotlib==3.2.0