Remove use of qt6agg and qt6cairo backends, leaving qt6 gui framework

ianthomas23 · ianthomas23 · commit 2f8b96f0bec8 · 2024-04-26T14:46:24.000+01:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1209,16 +1209,14 @@ def use(backend, *, force=True):
 
         - interactive backends:
           GTK3Agg, GTK3Cairo, GTK4Agg, GTK4Cairo, MacOSX, nbAgg, notebook, QtAgg,
-          QtCairo, TkAgg, TkCairo, WebAgg, WX, WXAgg, WXCairo, Qt5Agg, Qt5Cairo,
-          Qt6Agg, Qt6Cairo
+          QtCairo, TkAgg, TkCairo, WebAgg, WX, WXAgg, WXCairo, Qt5Agg, Qt5Cairo
 
         - non-interactive backends:
           agg, cairo, pdf, pgf, ps, svg, template
 
         or a string of the form: ``module://my.module.name``.
 
-        notebook is a synonym for nbAgg, Qt6Agg for QtAgg, and Qt6Cairo for
-        QtCairo.
+        notebook is a synonym for nbAgg.
 
         Switching to an interactive backend is not possible if an unrelated
         event loop has already been started (e.g., switching to GTK3Agg if a
diff --git a/lib/matplotlib/backends/registry.py b/lib/matplotlib/backends/registry.py
@@ -46,8 +46,6 @@ class BackendRegistry:
         "qtcairo": "qt",
         "qt5agg": "qt5",
         "qt5cairo": "qt5",
-        "qt6agg": "qt",
-        "qt6cairo": "qt",
         "tkagg": "tk",
         "tkcairo": "tk",
         "webagg": "webagg",
@@ -71,7 +69,7 @@ class BackendRegistry:
         "macosx": "macosx",
         "qt": "qtagg",
         "qt5": "qt5agg",
-        "qt6": "qt6agg",
+        "qt6": "qtagg",
         "tk": "tkagg",
         "wx": "wxagg",
     }
@@ -92,8 +90,6 @@ def __init__(self):
         # "module://some.backend" syntax.
         self._name_to_module = {
             "notebook": "nbagg",
-            "qt6agg": "qtagg",
-            "qt6cairo": "qtcairo",
         }
 
     def _backend_module_name(self, backend):
diff --git a/lib/matplotlib/tests/test_backend_registry.py b/lib/matplotlib/tests/test_backend_registry.py
@@ -43,7 +43,7 @@ def test_list_builtin():
     # Compare using sets as order is not important
     assert {*backends} == {
         'gtk3agg', 'gtk3cairo', 'gtk4agg', 'gtk4cairo', 'macosx', 'nbagg', 'notebook',
-        'qtagg', 'qtcairo', 'qt5agg', 'qt5cairo', 'qt6agg', 'qt6cairo', 'tkagg',
+        'qtagg', 'qtcairo', 'qt5agg', 'qt5cairo', 'tkagg',
         'tkcairo', 'webagg', 'wx', 'wxagg', 'wxcairo', 'agg', 'cairo', 'pdf', 'pgf',
         'ps', 'svg', 'template',
     }
@@ -54,7 +54,7 @@ def test_list_builtin():
     [
         (BackendFilter.INTERACTIVE,
          ['gtk3agg', 'gtk3cairo', 'gtk4agg', 'gtk4cairo', 'macosx', 'nbagg', 'notebook',
-          'qtagg', 'qtcairo', 'qt5agg', 'qt5cairo', 'qt6agg', 'qt6cairo', 'tkagg',
+          'qtagg', 'qtcairo', 'qt5agg', 'qt5cairo', 'tkagg',
           'tkcairo', 'webagg', 'wx', 'wxagg', 'wxcairo']),
         (BackendFilter.NON_INTERACTIVE,
          ['agg', 'cairo', 'pdf', 'pgf', 'ps', 'svg', 'template']),
