Merge pull request matplotlib#30533 from QuLogic/gtk-require-version

gtk: Add more explicit version requirements

Author: tacaswell

.github/workflows/tests.yml

@@ -115,6 +115,7 @@ jobs:
               fonts-wqy-zenhei \
               gdb \
               gir1.2-gtk-3.0 \
+              gir1.2-gtk-4.0 \
               graphviz \
               inkscape \
               language-pack-de \
@@ -150,7 +151,6 @@ jobs:
             fi
             if [[ "${{ matrix.os }}" = ubuntu-22.04 ]]; then
               sudo apt-get install -yy --no-install-recommends \
-                gir1.2-gtk-4.0 \
                 libgirepository1.0-dev
             else  # ubuntu-24.04
               sudo apt-get install -yy --no-install-recommends \

lib/matplotlib/backends/backend_gtk3.py

@@ -18,13 +18,7 @@
     # :raises ValueError: If module/version is already loaded, already
     # required, or unavailable.
     gi_require_version("Gtk", "3.0")
-    # Also require GioUnix to avoid PyGIWarning when Gio is imported
-    # GioUnix is platform-specific and may not be available on all systems
-    try:
-        gi_require_version("GioUnix", "2.0")
-    except ValueError:
-        # GioUnix is not available on this platform, which is fine
-        pass
+    gi_require_version("Gdk", "3.0")
 except ValueError as e:
     # in this case we want to re-raise as ImportError so the
     # auto-backend selection logic correctly skips.

lib/matplotlib/backends/backend_gtk4.py

@@ -17,13 +17,8 @@
     # :raises ValueError: If module/version is already loaded, already
     # required, or unavailable.
     gi_require_version("Gtk", "4.0")
-    # Also require GioUnix to avoid PyGIWarning when Gio is imported
-    # GioUnix is platform-specific and may not be available on all systems
-    try:
-        gi_require_version("GioUnix", "2.0")
-    except ValueError:
-        # GioUnix is not available on this platform, which is fine
-        pass
+    gi_require_version("Gdk", "4.0")
+    gi_require_version("GdkPixbuf", "2.0")
 except ValueError as e:
     # in this case we want to re-raise as ImportError so the
     # auto-backend selection logic correctly skips.

lib/matplotlib/tests/test_backend_gtk3.py

@@ -5,51 +5,6 @@
 from unittest import mock
 
 
-@pytest.mark.backend("gtk3agg", skip_on_importerror=True)
-def test_correct_key():
-    pytest.xfail("test_widget_send_event is not triggering key_press_event")
-
-    from gi.repository import Gdk, Gtk  # type: ignore[import]
-    fig = plt.figure()
-    buf = []
-
-    def send(event):
-        for key, mod in [
-                (Gdk.KEY_a, Gdk.ModifierType.SHIFT_MASK),
-                (Gdk.KEY_a, 0),
-                (Gdk.KEY_a, Gdk.ModifierType.CONTROL_MASK),
-                (Gdk.KEY_agrave, 0),
-                (Gdk.KEY_Control_L, Gdk.ModifierType.MOD1_MASK),
-                (Gdk.KEY_Alt_L, Gdk.ModifierType.CONTROL_MASK),
-                (Gdk.KEY_agrave,
-                 Gdk.ModifierType.CONTROL_MASK
-                 | Gdk.ModifierType.MOD1_MASK
-                 | Gdk.ModifierType.MOD4_MASK),
-                (0xfd16, 0),   # KEY_3270_Play.
-                (Gdk.KEY_BackSpace, 0),
-                (Gdk.KEY_BackSpace, Gdk.ModifierType.CONTROL_MASK),
-        ]:
-            # This is not actually really the right API: it depends on the
-            # actual keymap (e.g. on Azerty, shift+agrave -> 0).
-            Gtk.test_widget_send_key(fig.canvas, key, mod)
-
-    def receive(event):
-        buf.append(event.key)
-        if buf == [
-                "A", "a", "ctrl+a",
-                "\N{LATIN SMALL LETTER A WITH GRAVE}",
-                "alt+control", "ctrl+alt",
-                "ctrl+alt+super+\N{LATIN SMALL LETTER A WITH GRAVE}",
-                # (No entry for KEY_3270_Play.)
-                "backspace", "ctrl+backspace",
-        ]:
-            plt.close(fig)
-
-    fig.canvas.mpl_connect("draw_event", send)
-    fig.canvas.mpl_connect("key_press_event", receive)
-    plt.show()
-
-
 @pytest.mark.backend("gtk3agg", skip_on_importerror=True)
 def test_save_figure_return():
     from gi.repository import Gtk

lib/matplotlib/tests/test_getattr.py

@@ -1,25 +1,29 @@
 from importlib import import_module
 from pkgutil import walk_packages
+import sys
+import warnings
 
-import matplotlib
 import pytest
 
+import matplotlib
+from matplotlib.testing import is_ci_environment, subprocess_run_helper
+
 # Get the names of all matplotlib submodules,
 # except for the unit tests and private modules.
-module_names = [
-    m.name
-    for m in walk_packages(
-        path=matplotlib.__path__, prefix=f'{matplotlib.__name__}.'
-    )
-    if not m.name.startswith(__package__)
-    and not any(x.startswith('_') for x in m.name.split('.'))
-]
+module_names = []
+backend_module_names = []
+for m in walk_packages(path=matplotlib.__path__, prefix=f'{matplotlib.__name__}.'):
+    if m.name.startswith(__package__):
+        continue
+    if any(x.startswith('_') for x in m.name.split('.')):
+        continue
+    if 'backends.backend_' in m.name:
+        backend_module_names.append(m.name)
+    else:
+        module_names.append(m.name)
 
 
-@pytest.mark.parametrize('module_name', module_names)
-@pytest.mark.filterwarnings('ignore::DeprecationWarning')
-@pytest.mark.filterwarnings('ignore::ImportWarning')
-def test_getattr(module_name):
+def _test_getattr(module_name, use_pytest=True):
     """
     Test that __getattr__ methods raise AttributeError for unknown keys.
     See #20822, #20855.
@@ -28,8 +32,35 @@ def test_getattr(module_name):
         module = import_module(module_name)
     except (ImportError, RuntimeError, OSError) as e:
         # Skip modules that cannot be imported due to missing dependencies
-        pytest.skip(f'Cannot import {module_name} due to {e}')
+        if use_pytest:
+            pytest.skip(f'Cannot import {module_name} due to {e}')
+        else:
+            print(f'SKIP: Cannot import {module_name} due to {e}')
+            return
 
     key = 'THIS_SYMBOL_SHOULD_NOT_EXIST'
     if hasattr(module, key):
         delattr(module, key)
+
+
+@pytest.mark.parametrize('module_name', module_names)
+@pytest.mark.filterwarnings('ignore::DeprecationWarning')
+@pytest.mark.filterwarnings('ignore::ImportWarning')
+def test_getattr(module_name):
+    _test_getattr(module_name)
+
+
+def _test_module_getattr():
+    warnings.filterwarnings('ignore', category=DeprecationWarning)
+    warnings.filterwarnings('ignore', category=ImportWarning)
+    module_name = sys.argv[1]
+    _test_getattr(module_name, use_pytest=False)
+
+
+@pytest.mark.parametrize('module_name', backend_module_names)
+def test_backend_getattr(module_name):
+    proc = subprocess_run_helper(_test_module_getattr, module_name,
+                                 timeout=120 if is_ci_environment() else 20)
+    if 'SKIP: ' in proc.stdout:
+        pytest.skip(proc.stdout.removeprefix('SKIP: '))
+    print(proc.stdout)