Merge pull request #11705 from anntzer/warningslesstests

tacaswell · web-flow · commit e36fe9ac576f · 2018-07-24T20:41:42.000-04:00
MNT: Suppress/fix some test warnings.
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1111,7 +1111,8 @@ def _transform(self, a):
         """
         Inplace transformation.
         """
-        masked = np.abs(a) > self.linthresh
+        with np.errstate(invalid="ignore"):
+            masked = np.abs(a) > self.linthresh
         sign = np.sign(a[masked])
         log = (self._linscale_adj + np.log(np.abs(a[masked]) / self.linthresh))
         log *= sign * self.linthresh
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -1714,7 +1714,7 @@ def test_scatter_marker(self):
                     c=[(1, 0, 0), 'y', 'b', 'lime'],
                     s=[60, 50, 40, 30],
                     edgecolors=['k', 'r', 'g', 'b'],
-                    verts=verts)
+                    marker=verts)
 
     @image_comparison(baseline_images=['scatter_2D'], remove_text=True,
                       extensions=['png'])
diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py
@@ -67,11 +67,11 @@ def test_otf():
     if os.path.exists(fname):
         assert is_opentype_cff_font(fname)
 
-    otf_files = [f for f in fontManager.ttffiles if 'otf' in f]
-    for f in otf_files:
-        with open(f, 'rb') as fd:
-            res = fd.read(4) == b'OTTO'
-        assert res == is_opentype_cff_font(f)
+    for f in fontManager.ttflist:
+        if 'otf' in f.fname:
+            with open(f.fname, 'rb') as fd:
+                res = fd.read(4) == b'OTTO'
+            assert res == is_opentype_cff_font(f.fname)
 
 
 @pytest.mark.skipif(not has_fclist, reason='no fontconfig installed')
diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py
@@ -1,3 +1,4 @@
+from contextlib import ExitStack
 from copy import copy
 import io
 import os
@@ -875,8 +876,10 @@ def test_empty_imshow(make_norm):
 def test_imshow_float128():
     fig, ax = plt.subplots()
     ax.imshow(np.zeros((3, 3), dtype=np.longdouble))
-    # Ensure that drawing doesn't cause crash
-    fig.canvas.draw()
+    with (ExitStack() if np.can_cast(np.longdouble, np.float64, "equiv")
+          else pytest.warns(UserWarning)):
+        # Ensure that drawing doesn't cause crash.
+        fig.canvas.draw()
 
 
 def test_imshow_bool():
diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py
@@ -5,6 +5,7 @@
 from numpy.testing import assert_almost_equal, assert_array_equal
 import pytest
 
+from matplotlib.cbook import MatplotlibDeprecationWarning
 from matplotlib.patches import Polygon, Rectangle
 from matplotlib.testing.decorators import image_comparison, check_figures_equal
 import matplotlib.pyplot as plt
@@ -344,8 +345,9 @@ def test_patch_str():
     s = mpatches.Shadow(p, 1, 1)
     assert str(s) == "Shadow(ConnectionPatch((1, 2), (3, 4)))"
 
-    p = mpatches.YAArrow(plt.gcf(), (1, 0), (2, 1), width=0.1)
-    assert str(p) == "YAArrow()"
+    with pytest.warns(MatplotlibDeprecationWarning):
+        p = mpatches.YAArrow(plt.gcf(), (1, 0), (2, 1), width=0.1)
+        assert str(p) == "YAArrow()"
 
     # Not testing Arrow, FancyArrow here
     # because they seem to exist only for historical reasons.
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -10,6 +10,7 @@
 import pytest
 
 import matplotlib as mpl
+from matplotlib.cbook import MatplotlibDeprecationWarning
 import matplotlib.pyplot as plt
 import matplotlib.colors as mcolors
 import numpy as np
@@ -120,8 +121,7 @@ def test_Bug_2543():
     # printed in the test suite.
     with warnings.catch_warnings():
         warnings.filterwarnings('ignore',
-                                message='.*(deprecated|obsolete)',
-                                category=UserWarning)
+                                category=MatplotlibDeprecationWarning)
         with mpl.rc_context():
             _copy = mpl.rcParams.copy()
             for key in _copy:
