Merge pull request #16261 from tacaswell/tst_fix_qt_fixtures

anntzer · web-flow · commit cd580da8f22f · 2020-01-23T09:34:11.000+01:00
TST: move the Qt-specific handling to conftest
diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
@@ -1,5 +1,5 @@
 import pytest
-
+import sys
 import matplotlib
 from matplotlib import cbook
 
@@ -45,6 +45,30 @@ def mpl_test_settings(request):
                 'skip_on_importerror', False)
             prev_backend = matplotlib.get_backend()
 
+            # special case Qt backend importing to avoid conflicts
+            if backend.lower().startswith('qt4'):
+                if any(k in sys.modules for k in ('PyQt5', 'PySide2')):
+                    pytest.skip('Qt5 binding already imported')
+                try:
+                    import PyQt4
+                # RuntimeError if PyQt5 already imported.
+                except (ImportError, RuntimeError):
+                    try:
+                        import PySide
+                    except ImportError:
+                        pytest.skip("Failed to import a Qt4 binding.")
+            elif backend.lower().startswith('qt5'):
+                if any(k in sys.modules for k in ('PyQt4', 'PySide')):
+                    pytest.skip('Qt4 binding already imported')
+                try:
+                    import PyQt5
+                # RuntimeError if PyQt4 already imported.
+                except (ImportError, RuntimeError):
+                    try:
+                        import PySide2
+                    except ImportError:
+                        pytest.skip("Failed to import a Qt5 binding.")
+
         # Default of cleanup and image_comparison too.
         style = ["classic", "_classic_test_patch"]
         style_marker = request.node.get_closest_marker('style')
diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py
@@ -10,47 +10,9 @@
 import pytest
 
 
-@pytest.fixture(autouse=True)
-def mpl_test_settings(qt_core, mpl_test_settings):
-    """
-    Ensure qt_core fixture is *first* fixture.
-
-    We override the `mpl_test_settings` fixture and depend on the `qt_core`
-    fixture first. It is very important that it is first, because it skips
-    tests when Qt is not available, and if not, then the main
-    `mpl_test_settings` fixture will try to switch backends before the skip can
-    be triggered.
-    """
-
-
 @pytest.fixture
 def qt_core(request):
     backend, = request.node.get_closest_marker('backend').args
-    if backend == 'Qt4Agg':
-        if any(k in sys.modules for k in ('PyQt5', 'PySide2')):
-            pytest.skip('Qt5 binding already imported')
-        try:
-            import PyQt4
-        # RuntimeError if PyQt5 already imported.
-        except (ImportError, RuntimeError):
-            try:
-                import PySide
-            except ImportError:
-                pytest.skip("Failed to import a Qt4 binding.")
-    elif backend == 'Qt5Agg':
-        if any(k in sys.modules for k in ('PyQt4', 'PySide')):
-            pytest.skip('Qt4 binding already imported')
-        try:
-            import PyQt5
-        # RuntimeError if PyQt4 already imported.
-        except (ImportError, RuntimeError):
-            try:
-                import PySide2
-            except ImportError:
-                pytest.skip("Failed to import a Qt5 binding.")
-    else:
-        raise ValueError('Backend marker has unknown value: ' + backend)
-
     qt_compat = pytest.importorskip('matplotlib.backends.qt_compat')
     QtCore = qt_compat.QtCore
 
diff --git a/requirements/testing/travis_all.txt b/requirements/testing/travis_all.txt
@@ -5,7 +5,7 @@ cycler
 numpy
 pillow
 pyparsing
-pytest!=4.6.0,!=5.3.3
+pytest!=4.6.0
 pytest-cov
 pytest-rerunfailures
 pytest-timeout
