From bbb35134a70e5474afb3629b0d5853dffe199279 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 31 Jan 2016 08:36:38 -0600 Subject: [PATCH] Add a note about the new warning --- skimage/io/tests/test_mpl_imshow.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/skimage/io/tests/test_mpl_imshow.py b/skimage/io/tests/test_mpl_imshow.py index 19a3c52e..6ebf800b 100644 --- a/skimage/io/tests/test_mpl_imshow.py +++ b/skimage/io/tests/test_mpl_imshow.py @@ -78,7 +78,10 @@ def test_low_dynamic_range(): def test_outside_standard_range(): plt.figure() - with expected_warnings(["out of standard range"]): + # Warning raised by matplotlib on Windows: + # "The CObject type is marked Pending Deprecation in Python 2.7. + # Please use capsule objects instead." + with expected_warnings(["out of standard range|CObject type is marked"]): ax_im = io.imshow(im_hi) assert ax_im.get_clim() == (im_hi.min(), im_hi.max()) assert n_subplots(ax_im) == 2 @@ -87,8 +90,10 @@ def test_outside_standard_range(): def test_nonstandard_type(): plt.figure() - - with expected_warnings(["Low image dynamic range"]): + # Warning raised by matplotlib on Windows: + # "The CObject type is marked Pending Deprecation in Python 2.7. + # Please use capsule objects instead." + with expected_warnings(["Low image dynamic range|CObject type is marked"]): ax_im = io.imshow(im64) assert ax_im.get_clim() == (im64.min(), im64.max()) assert n_subplots(ax_im) == 2