Don't fail Qt tests if bindings not installed.

anntzer · anntzer · commit 04a0de8066e5 · 2018-07-09T11:41:50.000+02:00
diff --git a/lib/matplotlib/tests/test_backend_qt4.py b/lib/matplotlib/tests/test_backend_qt4.py
@@ -7,12 +7,18 @@
 
 import pytest
 
-with matplotlib.rc_context(rc={'backend': 'Qt4Agg'}):
-    qt_compat = pytest.importorskip('matplotlib.backends.qt_compat')
+try:
+    import PyQt4
+except (ImportError, RuntimeError):  # RuntimeError if PyQt5 already imported.
+    try:
+        import PySide
+    except ImportError:
+        pytestmark = pytest.mark.skip("Failed to import a Qt4 binding.")
+
+from matplotlib.backends.qt_compat import QtCore
 from matplotlib.backends.backend_qt4 import (
     MODIFIER_KEYS, SUPER, ALT, CTRL, SHIFT)  # noqa
 
-QtCore = qt_compat.QtCore
 _, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
 _, AltModifier, AltKey = MODIFIER_KEYS[ALT]
 _, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
diff --git a/lib/matplotlib/tests/test_backend_qt5.py b/lib/matplotlib/tests/test_backend_qt5.py
@@ -7,13 +7,18 @@
 
 import pytest
 
-with matplotlib.rc_context(rc={'backend': 'Qt5Agg'}):
-    qt_compat = pytest.importorskip('matplotlib.backends.qt_compat',
-                                    minversion='5')
+try:
+    import PyQt5
+except (ImportError, RuntimeError):  # RuntimeError if PyQt4 already imported.
+    try:
+        import PySide2
+    except ImportError:
+        pytestmark = pytest.mark.skip("Failed to import a Qt5 binding.")
+
+from matplotlib.backends.qt_compat import QtCore
 from matplotlib.backends.backend_qt5 import (
     MODIFIER_KEYS, SUPER, ALT, CTRL, SHIFT)  # noqa
 
-QtCore = qt_compat.QtCore
 _, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
 _, AltModifier, AltKey = MODIFIER_KEYS[ALT]
 _, SuperModifier, SuperKey = MODIFIER_KEYS[SUPER]
