Bump minimum QT5 version to 5.12

oscargus · oscargus · commit 0009b81707c1 · 2023-03-02T09:43:54.000+01:00
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -14,14 +14,14 @@
 from . import qt_compat
 from .qt_compat import (
     QtCore, QtGui, QtWidgets, __version__, QT_API,
-    _enum, _to_int, _isdeleted, _maybe_allow_interrupt
+    _to_int, _isdeleted, _maybe_allow_interrupt
 )
 
 
 # SPECIAL_KEYS are Qt::Key that do *not* return their Unicode name
 # instead they have manually specified names.
 SPECIAL_KEYS = {
-    _to_int(getattr(_enum("QtCore.Qt.Key"), k)): v for k, v in [
+    _to_int(getattr(QtCore.Qt.Key, k)): v for k, v in [
         ("Key_Escape", "escape"),
         ("Key_Tab", "tab"),
         ("Key_Backspace", "backspace"),
@@ -66,8 +66,8 @@
 # Elements are (Qt::KeyboardModifiers, Qt::Key) tuples.
 # Order determines the modifier order (ctrl+alt+...) reported by Matplotlib.
 _MODIFIER_KEYS = [
-    (_to_int(getattr(_enum("QtCore.Qt.KeyboardModifier"), mod)),
-     _to_int(getattr(_enum("QtCore.Qt.Key"), key)))
+    (_to_int(getattr(QtCore.Qt.KeyboardModifier, mod)),
+     _to_int(getattr(QtCore.Qt.Key, key)))
     for mod, key in [
         ("ControlModifier", "Key_Control"),
         ("AltModifier", "Key_Alt"),
@@ -76,7 +76,7 @@
     ]
 ]
 cursord = {
-    k: getattr(_enum("QtCore.Qt.CursorShape"), v) for k, v in [
+    k: getattr(QtCore.Qt.CursorShape, v) for k, v in [
         (cursors.MOVE, "SizeAllCursor"),
         (cursors.HAND, "PointingHandCursor"),
         (cursors.POINTER, "ArrowCursor"),
@@ -130,11 +130,8 @@ def _create_qApp():
                     'versions may not work as expected.'
                 )
                 break
-        try:
-            QtWidgets.QApplication.setAttribute(
-                QtCore.Qt.AA_EnableHighDpiScaling)
-        except AttributeError:  # Only for Qt>=5.6, <6.
-            pass
+        QtWidgets.QApplication.setAttribute(
+            QtCore.Qt.ApplicationAttribute.AA_EnableHighDpiScaling)
         try:
             QtWidgets.QApplication.setHighDpiScaleFactorRoundingPolicy(
                 QtCore.Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
@@ -148,10 +145,7 @@ def _create_qApp():
         app.lastWindowClosed.connect(app.quit)
         cbook._setup_new_guiapp()
 
-    try:
-        app.setAttribute(QtCore.Qt.AA_UseHighDpiPixmaps)  # Only for Qt<6.
-    except AttributeError:
-        pass
+    app.setAttribute(QtCore.Qt.ApplicationAttribute.AA_UseHighDpiPixmaps)
 
     return app
 
@@ -191,7 +185,7 @@ class FigureCanvasQT(FigureCanvasBase, QtWidgets.QWidget):
     manager_class = _api.classproperty(lambda cls: FigureManagerQT)
 
     buttond = {
-        getattr(_enum("QtCore.Qt.MouseButton"), k): v for k, v in [
+        getattr(QtCore.Qt.MouseButton, k): v for k, v in [
             ("LeftButton", MouseButton.LEFT),
             ("RightButton", MouseButton.RIGHT),
             ("MiddleButton", MouseButton.MIDDLE),
@@ -209,8 +203,7 @@ def __init__(self, figure=None):
         self._draw_rect_callback = lambda painter: None
         self._in_resize_event = False
 
-        self.setAttribute(
-            _enum("QtCore.Qt.WidgetAttribute").WA_OpaquePaintEvent)
+        self.setAttribute(QtCore.Qt.WidgetAttribute.WA_OpaquePaintEvent)
         self.setMouseTracking(True)
         self.resize(*self.get_width_height())
 
@@ -564,7 +557,7 @@ def __init__(self, canvas, num):
         # StrongFocus accepts both tab and click to focus and will enable the
         # canvas to process event without clicking.
         # https://doc.qt.io/qt-5/qt.html#FocusPolicy-enum
-        self.canvas.setFocusPolicy(_enum("QtCore.Qt.FocusPolicy").StrongFocus)
+        self.canvas.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus)
         self.canvas.setFocus()
 
         self.window.raise_()
@@ -642,8 +635,8 @@ def __init__(self, canvas, parent=None, coordinates=True):
         """coordinates: should we show the coordinates on the right?"""
         QtWidgets.QToolBar.__init__(self, parent)
         self.setAllowedAreas(QtCore.Qt.ToolBarArea(
-            _to_int(_enum("QtCore.Qt.ToolBarArea").TopToolBarArea) |
-            _to_int(_enum("QtCore.Qt.ToolBarArea").BottomToolBarArea)))
+            QtCore.Qt.ToolBarArea.TopToolBarArea |
+            QtCore.Qt.ToolBarArea.BottomToolBarArea))
 
         self.coordinates = coordinates
         self._actions = {}  # mapping of toolitem method names to QActions.
@@ -667,11 +660,12 @@ def __init__(self, canvas, parent=None, coordinates=True):
         if self.coordinates:
             self.locLabel = QtWidgets.QLabel("", self)
             self.locLabel.setAlignment(QtCore.Qt.AlignmentFlag(
-                _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignRight) |
-                _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignVCenter)))
+                QtCore.Qt.AlignmentFlag.AlignRight |
+                QtCore.Qt.AlignmentFlag.AlignVCenter
+            ))
             self.locLabel.setSizePolicy(QtWidgets.QSizePolicy(
-                _enum("QtWidgets.QSizePolicy.Policy").Expanding,
-                _enum("QtWidgets.QSizePolicy.Policy").Ignored,
+                QtWidgets.QSizePolicy.Policy.Expanding,
+                QtWidgets.QSizePolicy.Policy.Ignored,
             ))
             labelAction = self.addWidget(self.locLabel)
             labelAction.setVisible(True)
@@ -697,7 +691,7 @@ def _icon(self, name):
             icon_color = self.palette().color(self.foregroundRole())
             mask = pm.createMaskFromColor(
                 QtGui.QColor('black'),
-                _enum("QtCore.Qt.MaskMode").MaskOutColor)
+                QtCore.Qt.MaskMode.MaskOutColor)
             pm.fill(icon_color)
             pm.setMask(mask)
         return QtGui.QIcon(pm)
@@ -801,8 +795,8 @@ def save_figure(self, *args):
             except Exception as e:
                 QtWidgets.QMessageBox.critical(
                     self, "Error saving file", str(e),
-                    _enum("QtWidgets.QMessageBox.StandardButton").Ok,
-                    _enum("QtWidgets.QMessageBox.StandardButton").NoButton)
+                    QtWidgets.QMessageBox.StandardButton.Ok,
+                    QtWidgets.QMessageBox.StandardButton.NoButton)
 
     def set_history_buttons(self):
         can_backward = self._nav_stack._pos > 0
@@ -916,15 +910,15 @@ def __init__(self, toolmanager, parent=None):
         ToolContainerBase.__init__(self, toolmanager)
         QtWidgets.QToolBar.__init__(self, parent)
         self.setAllowedAreas(QtCore.Qt.ToolBarArea(
-            _to_int(_enum("QtCore.Qt.ToolBarArea").TopToolBarArea) |
-            _to_int(_enum("QtCore.Qt.ToolBarArea").BottomToolBarArea)))
+            QtCore.Qt.ToolBarArea.TopToolBarArea |
+            QtCore.Qt.ToolBarArea.BottomToolBarArea))
         message_label = QtWidgets.QLabel("")
         message_label.setAlignment(QtCore.Qt.AlignmentFlag(
-            _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignRight) |
-            _to_int(_enum("QtCore.Qt.AlignmentFlag").AlignVCenter)))
+            QtCore.Qt.AlignmentFlag.AlignRight |
+            QtCore.Qt.AlignmentFlag.AlignVCenter))
         message_label.setSizePolicy(QtWidgets.QSizePolicy(
-            _enum("QtWidgets.QSizePolicy.Policy").Expanding,
-            _enum("QtWidgets.QSizePolicy.Policy").Ignored,
+            QtWidgets.QSizePolicy.Policy.Expanding,
+            QtWidgets.QSizePolicy.Policy.Ignored,
         ))
         self._message_action = self.addWidget(message_label)
         self._toolitems = {}
diff --git a/lib/matplotlib/backends/backend_qtagg.py b/lib/matplotlib/backends/backend_qtagg.py
@@ -6,9 +6,9 @@
 
 from matplotlib.transforms import Bbox
 
-from .qt_compat import QT_API, _enum
+from .qt_compat import QT_API, QtCore, QtGui
 from .backend_agg import FigureCanvasAgg
-from .backend_qt import QtCore, QtGui, _BackendQT, FigureCanvasQT
+from .backend_qt import _BackendQT, FigureCanvasQT
 from .backend_qt import (  # noqa: F401 # pylint: disable=W0611
     FigureManagerQT, NavigationToolbar2QT)
 
@@ -57,7 +57,7 @@ def paintEvent(self, event):
 
             painter.eraseRect(rect)  # clear the widget canvas
             qimage = QtGui.QImage(ptr, buf.shape[1], buf.shape[0],
-                                  _enum("QtGui.QImage.Format").Format_RGBA8888)
+                                  QtGui.QImage.Format.Format_RGBA8888)
             qimage.setDevicePixelRatio(self.device_pixel_ratio)
             # set origin using original QT coordinates
             origin = QtCore.QPoint(rect.left(), rect.top())
diff --git a/lib/matplotlib/backends/backend_qtcairo.py b/lib/matplotlib/backends/backend_qtcairo.py
@@ -1,8 +1,8 @@
 import ctypes
 
 from .backend_cairo import cairo, FigureCanvasCairo
-from .backend_qt import QtCore, QtGui, _BackendQT, FigureCanvasQT
-from .qt_compat import QT_API, _enum
+from .backend_qt import _BackendQT, FigureCanvasQT
+from .qt_compat import QT_API, QtCore, QtGui
 
 
 class FigureCanvasQTCairo(FigureCanvasCairo, FigureCanvasQT):
@@ -28,7 +28,7 @@ def paintEvent(self, event):
             ptr = buf
         qimage = QtGui.QImage(
             ptr, width, height,
-            _enum("QtGui.QImage.Format").Format_ARGB32_Premultiplied)
+            QtGui.QImage.Format.Format_ARGB32_Premultiplied)
         # Adjust the buf reference count to work around a memory leak bug in
         # QImage under PySide.
         if QT_API == "PySide2" and QtCore.__version_info__ < (5, 12):
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -139,11 +139,11 @@ def _isdeleted(obj):
 _version_info = tuple(QtCore.QLibraryInfo.version().segments())
 
 
-if _version_info < (5, 10):
+if _version_info < (5, 12):
     raise ImportError(
         f"The Qt version imported is "
         f"{QtCore.QLibraryInfo.version().toString()} but Matplotlib requires "
-        f"Qt>=5.10")
+        f"Qt>=5.12")
 
 
 # Fixes issues with Big Sur
@@ -154,17 +154,6 @@ def _isdeleted(obj):
     os.environ.setdefault("QT_MAC_WANTS_LAYER", "1")
 
 
-# PyQt6 enum compat helpers.
-
-
-@functools.cache
-def _enum(name):
-    # foo.bar.Enum.Entry (PyQt6) <=> foo.bar.Entry (non-PyQt6).
-    return operator.attrgetter(
-        name if QT_API == 'PyQt6' else name.rpartition(".")[0]
-    )(sys.modules[QtCore.__package__])
-
-
 # Backports.
 
 
@@ -207,7 +196,7 @@ def _maybe_allow_interrupt(qapp):
         wsock.setblocking(False)
         old_wakeup_fd = signal.set_wakeup_fd(wsock.fileno())
         sn = QtCore.QSocketNotifier(
-            rsock.fileno(), _enum('QtCore.QSocketNotifier.Type').Read
+            rsock.fileno(), QtCore.QSocketNotifier.Type.Read
         )
 
         # We do not actually care about this value other than running some
diff --git a/lib/matplotlib/backends/qt_editor/_formlayout.py b/lib/matplotlib/backends/qt_editor/_formlayout.py
@@ -47,8 +47,7 @@
 from numbers import Integral, Real
 
 from matplotlib import _api, colors as mcolors
-from matplotlib.backends.qt_compat import (
-    QtGui, QtWidgets, QtCore, _enum, _to_int)
+from matplotlib.backends.qt_compat import QtGui, QtWidgets, QtCore
 
 _log = logging.getLogger(__name__)
 
@@ -71,7 +70,7 @@ def __init__(self, parent=None):
     def choose_color(self):
         color = QtWidgets.QColorDialog.getColor(
             self._color, self.parentWidget(), "",
-            _enum("QtWidgets.QColorDialog.ColorDialogOption").ShowAlphaChannel)
+            QtWidgets.QColorDialog.ColorDialogOption.ShowAlphaChannel)
         if color.isValid():
             self.set_color(color)
 
@@ -204,7 +203,7 @@ def get_font(self):
 def is_edit_valid(edit):
     text = edit.text()
     state = edit.validator().validate(text, 0)[0]
-    return state == _enum("QtGui.QDoubleValidator.State").Acceptable
+    return state == QtGui.QDoubleValidator.State.Acceptable
 
 
 class FormWidget(QtWidgets.QWidget):
@@ -442,15 +441,13 @@ def __init__(self, data, title="", comment="",
         # Button box
         self.bbox = bbox = QtWidgets.QDialogButtonBox(
             QtWidgets.QDialogButtonBox.StandardButton(
-                _to_int(
-                    _enum("QtWidgets.QDialogButtonBox.StandardButton").Ok) |
-                _to_int(
-                    _enum("QtWidgets.QDialogButtonBox.StandardButton").Cancel)
+                    QtWidgets.QDialogButtonBox.StandardButton.Ok |
+                    QtWidgets.QDialogButtonBox.StandardButton.Cancel
             ))
         self.formwidget.update_buttons.connect(self.update_buttons)
         if self.apply_callback is not None:
             apply_btn = bbox.addButton(
-                _enum("QtWidgets.QDialogButtonBox.StandardButton").Apply)
+                QtWidgets.QDialogButtonBox.StandardButton.Apply)
             apply_btn.clicked.connect(self.apply)
 
         bbox.accepted.connect(self.accept)
@@ -475,7 +472,7 @@ def update_buttons(self):
                 valid = False
         for btn_type in ["Ok", "Apply"]:
             btn = self.bbox.button(
-                getattr(_enum("QtWidgets.QDialogButtonBox.StandardButton"),
+                getattr(QtWidgets.QDialogButtonBox.StandardButton,
                         btn_type))
             if btn is not None:
                 btn.setEnabled(valid)
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
