Updates for pytest and mpl2

fmaussion · efiring · commit 652cd7e35e7a · 2020-05-28T11:58:47.000-10:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1439,7 +1439,6 @@ def __init__(self, boundaries, ncolors, clip=False, extend='neither'):
         If the number of bins doesn't equal *ncolors*, the color is chosen
         by linear interpolation of the bin number onto color numbers.
         """
-
         if clip and extend != 'neither':
             raise ValueError("'clip=True' is not compatible with 'extend'")
         self.clip = clip
diff --git a/lib/matplotlib/tests/baseline_images/test_colors/boundarynorm_and_colorbar.png b/lib/matplotlib/tests/baseline_images/test_colors/boundarynorm_and_colorbar.png
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -6,7 +6,7 @@
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 
-from matplotlib import cyclert
+from matplotlib import cycler
 import matplotlib
 import matplotlib.colors as mcolors
 import matplotlib.cm as cm
@@ -297,8 +297,8 @@ def test_BoundaryNorm():
     np.testing.assert_array_equal(4, mynorm(12))
 
     # Test raises
-    assert_raises(ValueError, mcolors.BoundaryNorm, bounds, cmref.N,
-                  extend='both', clip=True)
+    with pytest.raises(ValueError):
+        mcolors.BoundaryNorm(bounds, cmref.N, extend='both', clip=True)
 
     # Just min
     cmref = mcolors.ListedColormap(['blue', 'red'])
