Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markotoplak merged 2 commits into from
Dec 16, 2024
+7 −7
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a740fdc
Import localization from orangecanvas to avoid depending on Qt
janezd Dec 13, 2024
74f8282
require orange-canvas-core==0.2.5
markotoplak Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Orange/widgets/evaluate/owpredictions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion Orange/widgets/utils/localization/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from orangecanvas.utils.localization import pl
from orangecanvas.localization import pl

__all__ = ['pl']
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions i18n/trubar-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion requirements-gui.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading