MAINT: added partial support for Qt6 and dropped support for Qt4

(closes #212 - but see the followup at #235 for remaining issues to support Qt6)

Author: gdementen

condarecipe/larray-editor/meta.yaml

@@ -24,8 +24,8 @@ requirements:
     # requires larray >= 0.32 because of the LArray -> Array rename
     - larray >=0.32
     - matplotlib
-    - pyqt >=4.6  # for API v2
-    - qtpy
+    - pyqt >=5
+    - qtpy >=2  # for Qt6 support
     # jedi >=0.18 to workaround incompatibility between jedi <0.18 and parso >=0.8 (see #220)
     - jedi >=0.18
 

environment.yml

@@ -5,8 +5,8 @@ channels:
 dependencies:
   - pip
   - larray
-  - pyqt
-  - qtpy
+  - pyqt >=5
+  - qtpy >=2
   - matplotlib
   - pytables
   - pytest>=3.5

larray_editor/arraymodel.py

@@ -372,7 +372,7 @@ def flags(self, index):
         flags = QAbstractTableModel.flags(self, index)
         if not self.readonly:
             flags |= Qt.ItemIsEditable
-        return Qt.ItemFlags(flags)
+        return flags
 
     def data(self, index, role=Qt.DisplayRole):
         """Cell content"""

larray_editor/arraywidget.py

@@ -373,6 +373,8 @@ def keyPressEvent(self, event):
         # did before because that only seems to work for shortcut
         # defined using QKeySequence.StandardKey, which is not the case for
         # Ctrl + E
+        # FIXME: this is no longer supported by PyQt6
+        # TypeError: unsupported operand type(s) for |: 'KeyboardModifier' and 'int'
         keyseq = QKeySequence(event.modifiers() | event.key())
         if keyseq == QKeySequence.Copy:
             self.copy()

larray_editor/combo.py

@@ -16,6 +16,9 @@ def __next__(self):
             raise StopIteration
     next = __next__
 
+    def __iter__(self):
+        return self
+
 
 class SequenceStandardItemModel(QtGui.QStandardItemModel):
     """
@@ -72,7 +75,11 @@ def __init__(self, parent=None):
         self._list_view.setModel(model)
         self._model = model
         self.addItem("(select all)")
-        model[0].setTristate(True)
+        try:
+            model[0].setTristate(True)
+        except AttributeError:
+            # this is the new name for qt6+
+            model[0].setUserTristate(True)
 
         action = QtWidgets.QWidgetAction(self)
         action.setDefaultWidget(self._list_view)

larray_editor/commands.py

@@ -1,6 +1,13 @@
 import logging
 
-from qtpy.QtWidgets import QUndoCommand
+try:
+    from qtpy.QtWidgets import QUndoCommand
+except ImportError:
+    # PySide6 provides QUndoCommand in QtGui
+    # qtpy has been fixed (see https://github.com/spyder-ide/qtpy/pull/366) but the version available via conda as of
+    # 20/09/2022 (2.2) does not include the fix yet
+    from qtpy.QtGui import QUndoCommand
+
 from larray_editor.utils import logger
 
 

larray_editor/editor.py

@@ -28,17 +28,24 @@
 import larray as la
 
 from larray_editor.traceback_tools import StackSummary
-from larray_editor.utils import (PYQT5, _, create_action, show_figure, ima, commonpath, dependencies,
+from larray_editor.utils import (_, create_action, show_figure, ima, commonpath, dependencies,
                                  get_versions, get_documentation_url, urls, RecentlyUsedList)
 from larray_editor.arraywidget import ArrayEditorWidget
 from larray_editor.commands import EditSessionArrayCommand, EditCurrentArrayCommand
 
 from qtpy.QtCore import Qt, QUrl, QSettings
 from qtpy.QtGui import QDesktopServices, QKeySequence
 from qtpy.QtWidgets import (QMainWindow, QWidget, QListWidget, QListWidgetItem, QSplitter, QFileDialog, QPushButton,
-                            QDialogButtonBox, QShortcut, QVBoxLayout, QGridLayout, QLineEdit, QUndoStack,
+                            QDialogButtonBox, QShortcut, QVBoxLayout, QGridLayout, QLineEdit,
                             QCheckBox, QComboBox, QMessageBox, QDialog, QInputDialog, QLabel, QGroupBox, QRadioButton)
 
+try:
+    from qtpy.QtWidgets import QUndoStack
+except ImportError:
+    # PySide6 provides QUndoStack in QtGui
+    # unsure qtpy has been fixed yet (see https://github.com/spyder-ide/qtpy/pull/366 for the fix for QUndoCommand)
+    from qtpy.QtGui import QUndoStack
+
 try:
     from qtconsole.rich_jupyter_widget import RichJupyterWidget
     from qtconsole.inprocess import QtInProcessKernelManager
@@ -230,13 +237,10 @@ def _report_issue(*args, **kwargs):
             issue_template = issue_template.format(**versions)
 
             url = QUrl(urls[f'new_issue_{package}'])
-            if PYQT5:
-                from qtpy.QtCore import QUrlQuery
-                query = QUrlQuery()
-                query.addQueryItem("body", quote(issue_template))
-                url.setQuery(query)
-            else:
-                url.addEncodedQueryItem("body", quote(issue_template))
+            from qtpy.QtCore import QUrlQuery
+            query = QUrlQuery()
+            query.addQueryItem("body", quote(issue_template))
+            url.setQuery(query)
             QDesktopServices.openUrl(url)
 
         return _report_issue
@@ -1049,8 +1053,8 @@ def open_data(self):
         if self._ask_to_save_if_unsaved_modifications():
             filter = "All (*.xls *xlsx *.h5 *.csv);;Excel Files (*.xls *xlsx);;HDF Files (*.h5);;CSV Files (*.csv)"
             res = QFileDialog.getOpenFileNames(self, filter=filter)
-            # Qt5 returns a tuple (filepaths, '') instead of a string
-            filepaths = res[0] if PYQT5 else res
+            # Qt5+ returns a tuple (filepaths, '') instead of a string
+            filepaths = res[0]
             if len(filepaths) >= 1:
                 if all(['.csv' in filepath for filepath in filepaths]):
                     # this means that even a single .csv file will be passed as a list (so that we can add arrays

larray_editor/tests/test_api_larray.py

@@ -8,6 +8,10 @@
 from larray_editor.api import *
 from larray_editor.utils import logger
 
+import qtpy
+
+print(f"Using {qtpy.API_NAME} as Qt API")
+
 logger.setLevel(logging.DEBUG)
 
 lipro = la.Axis('lipro=P01..P15')

larray_editor/utils.py

@@ -13,18 +13,21 @@
 except TypeError:
     pass
 
-from qtpy import PYQT5
 from qtpy.QtCore import Qt, QSettings
 from qtpy.QtGui import QIcon, QColor, QFont, QKeySequence, QLinearGradient
 from qtpy.QtWidgets import QAction, QDialog, QVBoxLayout
 
-if PYQT5:
-    from matplotlib.backends.backend_qt5agg import FigureCanvas
+try:
+    # try the un-versioned backend first (for matplotlib 3.5+)
+
+    # this is equivalent to "from matplotlib.backends.backend_qtagg import FigureCanvas" but is easier to statically
+    # analyze for PyCharm et al.
+    from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
+    from matplotlib.backends.backend_qtagg import NavigationToolbar2QT as NavigationToolbar
+except ImportError:
+    # fall back to explicit qt5 backend (for matplotlib < 3.5)
+    from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
     from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
-else:
-    from matplotlib.backends.backend_qt4agg import FigureCanvas
-    from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar
-
 
 logger = logging.getLogger("editor")