FIX: deprecate qt4/5 rcparams

jklymak · jklymak · commit 3cce6f8f96cf · 2018-01-30T14:23:45.000-08:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -267,31 +267,26 @@ def validate_backend(s):
 
 
 def validate_qt4(s):
-    # Don't spam the test suite with warnings every time the rcparams are
-    # reset.  While it may seem better to use filterwarnings from within the
-    # test suite, pytest 3.1+ explicitly disregards warnings filters (pytest
-    # issue #2430).
     if s is None:
+        # return a reasonable default for deprecation period
         return 'PyQt4'
-    if not testing.is_called_from_pytest():
-        cbook.warn_deprecated(
-            "2.2",
-            "The backend.qt4 rcParam was deprecated in version 2.2.  In order "
-            "to force the use of a specific Qt4 binding, either import that "
-            "binding first, or set the QT_API environment variable.")
+    cbook.warn_deprecated(
+        "2.2",
+        "The backend.qt4 rcParam was deprecated in version 2.2.  In order "
+        "to force the use of a specific Qt4 binding, either import that "
+        "binding first, or set the QT_API environment variable.")
     return ValidateInStrings("backend.qt4", ['PyQt4', 'PySide', 'PyQt4v2'])(s)
 
 
 def validate_qt5(s):
-    # See comment re: validate_qt4.
     if s is None:
+        # return a reasonable default for deprecation period
         return 'PyQt5'
-    if not testing.is_called_from_pytest():
-        cbook.warn_deprecated(
-            "2.2",
-            "The backend.qt5 rcParam was deprecated in version 2.2.  In order "
-            "to force the use of a specific Qt5 binding, either import that "
-            "binding first, or set the QT_API environment variable.")
+    cbook.warn_deprecated(
+        "2.2",
+        "The backend.qt5 rcParam was deprecated in version 2.2.  In order "
+        "to force the use of a specific Qt5 binding, either import that "
+        "binding first, or set the QT_API environment variable.")
     return ValidateInStrings("backend.qt5", ['PyQt5', 'PySide2'])(s)
 
 
