Merge pull request #6955 from janezd/fix-headless-orange

[FIX] Orange can be imported without Qt (fixed importing localization)

Author: markotoplak

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(

Orange/widgets/utils/localization/__init__.py

@@ -1,3 +1,3 @@
-from orangecanvas.utils.localization import pl
+from orangecanvas.localization import pl
 
 __all__ = ['pl']

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

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"

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

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