Merge pull request #28204 from meeseeksmachine/auto-backport-of-pr-28195-on-v3.9.x

timhoffm · web-flow · commit ef1a2db3f7c7 · 2024-05-10T03:17:23.000+02:00
Backport PR #28195 on branch v3.9.x (TST: Prepare for pytest 9)
diff --git a/lib/matplotlib/tests/test_backend_bases.py b/lib/matplotlib/tests/test_backend_bases.py
@@ -1,3 +1,5 @@
+import importlib
+
 from matplotlib import path, transforms
 from matplotlib.backend_bases import (
     FigureCanvasBase, KeyEvent, LocationEvent, MouseButton, MouseEvent,
@@ -325,9 +327,7 @@ def test_toolbar_home_restores_autoscale():
 def test_draw(backend):
     from matplotlib.figure import Figure
     from matplotlib.backends.backend_agg import FigureCanvas
-    test_backend = pytest.importorskip(
-        f'matplotlib.backends.backend_{backend}'
-    )
+    test_backend = importlib.import_module(f'matplotlib.backends.backend_{backend}')
     TestCanvas = test_backend.FigureCanvas
     fig_test = Figure(constrained_layout=True)
     TestCanvas(fig_test)
diff --git a/lib/matplotlib/tests/test_backend_gtk3.py b/lib/matplotlib/tests/test_backend_gtk3.py
@@ -3,9 +3,6 @@
 import pytest
 
 
-pytest.importorskip("matplotlib.backends.backend_gtk3agg")
-
-
 @pytest.mark.backend("gtk3agg", skip_on_importerror=True)
 def test_correct_key():
     pytest.xfail("test_widget_send_event is not triggering key_press_event")
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
@@ -26,9 +26,7 @@
 
 @pytest.fixture
 def qt_core(request):
-    qt_compat = pytest.importorskip('matplotlib.backends.qt_compat')
-    QtCore = qt_compat.QtCore
-
+    from matplotlib.backends.qt_compat import QtCore
     return QtCore
 
 
