Skip to content

Commit

Permalink
Do not auto-detect PySide6 for now
Browse files Browse the repository at this point in the history
There are still multiple unsolved issues. We leave it in explicitly
though, so further testing and integration remains simple.
  • Loading branch information
karlch committed Jul 12, 2023
1 parent 3eb336c commit ee28b6f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ ignore_errors = true
deps =
-r{toxinidir}/misc/requirements/requirements_pyqt5.txt
-r{toxinidir}/misc/requirements/requirements_pyqt6.txt
-r{toxinidir}/misc/requirements/requirements_pyside6.txt
-r{toxinidir}/misc/requirements/requirements_piexif.txt
-r{toxinidir}/misc/requirements/requirements_lint.txt
commands =
Expand Down
8 changes: 6 additions & 2 deletions vimiv/qt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class WRAPPERS(enum.Enum):
PySide6 = "PySide6"


_WRAPPERS_PYQT = [WRAPPERS.PyQt5, WRAPPERS.PyQt6]
_WRAPPER_NAMES = [wrapper.value for wrapper in WRAPPERS]
_WRAPPER_NAMES_STR = ", ".join(_WRAPPER_NAMES)

Expand Down Expand Up @@ -55,8 +56,11 @@ def _select_wrapper():


def _autoselect_wrapper():
"""Select a python Qt wrapper version based on availability and enum order."""
for wrapper in WRAPPERS:
"""Select a python Qt wrapper version based on availability and enum order.
We do not auto-detect PySide6 yet, as there are still multiple issues.
"""
for wrapper in _WRAPPERS_PYQT:
try:
importlib.import_module(wrapper.value)
return wrapper
Expand Down

0 comments on commit ee28b6f

Please sign in to comment.