Merge remote-tracking branch 'upstream/master' into fix10788

sasoripathos · sasoripathos · commit 7d137887b6a4 · 2019-05-11T20:00:49.000-04:00
diff --git a/lib/matplotlib/backends/qt_compat.py b/lib/matplotlib/backends/qt_compat.py
@@ -30,13 +30,13 @@
         "pyqt": QT_API_PYQTv2, "pyside": QT_API_PYSIDE,
         None: None}
 # First, check if anything is already imported.
-if "PyQt5" in sys.modules:
+if "PyQt5.QtCore" in sys.modules:
     QT_API = QT_API_PYQT5
-elif "PySide2" in sys.modules:
+elif "PySide2.QtCore" in sys.modules:
     QT_API = QT_API_PYSIDE2
-elif "PyQt4" in sys.modules:
+elif "PyQt4.QtCore" in sys.modules:
     QT_API = QT_API_PYQTv2
-elif "PySide" in sys.modules:
+elif "PySide.QtCore" in sys.modules:
     QT_API = QT_API_PYSIDE
 # Otherwise, check the QT_API environment variable (from Enthought).  This can
 # only override the binding, not the backend (in other words, we check that the
diff --git a/pytest.ini b/pytest.ini
@@ -7,6 +7,8 @@ python_files = test_*.py
 markers =
     backend: Set alternate Matplotlib backend temporarily.
     style: Set alternate Matplotlib style temporarily.
+    baseline_images: Compare output against a known reference
+    pytz: Tests that require pytz to be installed
 
 filterwarnings =
     error
