Remove deprecated ContourSet.{vmin,vmax}.

anntzer · anntzer · commit b528ceea47fb · 2017-12-25T18:41:42.000-08:00
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -25,7 +25,6 @@
 import matplotlib.patches as mpatches
 import matplotlib.texmanager as texmanager
 import matplotlib.transforms as mtransforms
-from matplotlib.cbook import mplDeprecation
 
 # Import needed for adding manual selection capability to clabel
 from matplotlib.blocking_input import BlockingContourLabeler
@@ -1172,20 +1171,6 @@ def _contour_level_args(self, z, args):
         if len(self.levels) > 1 and np.min(np.diff(self.levels)) <= 0.0:
             raise ValueError("Contour levels must be increasing")
 
-    @property
-    def vmin(self):
-        warnings.warn("vmin is deprecated and will be removed in 2.2 "
-                      "and not replaced.",
-                      mplDeprecation)
-        return getattr(self, '_vmin', None)
-
-    @property
-    def vmax(self):
-        warnings.warn("vmax is deprecated and will be removed in 2.2 "
-                      "and not replaced.",
-                      mplDeprecation)
-        return getattr(self, '_vmax', None)
-
     def _process_levels(self):
         """
         Assign values to :attr:`layers` based on :attr:`levels`,
@@ -1195,10 +1180,6 @@ def _process_levels(self):
         a line is a thin layer.  No extended levels are needed
         with line contours.
         """
-        # following are deprecated and will be removed in 2.2
-        self._vmin = np.min(self.levels)
-        self._vmax = np.max(self.levels)
-
         # Make a private _levels to include extended regions; we
         # want to leave the original levels attribute unchanged.
         # (Colorbar needs this even for line contours.)
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -305,26 +305,6 @@ def test_contourf_decreasing_levels():
         plt.contourf(z, [1.0, 0.0])
 
 
-def test_vminvmax_warning():
-    z = [[0.1, 0.3], [0.5, 0.7]]
-    plt.figure()
-    cs = plt.contourf(z, [0.0, 1.0])
-
-    with warnings.catch_warnings(record=True) as w:
-        warnings.simplefilter("always")
-        cs.vmin
-        assert len(w) == 1
-        msg = "vmin is deprecated and will be removed in 2.2 "
-        assert str(w[0].message).startswith(msg)
-
-    with warnings.catch_warnings(record=True) as w:
-        warnings.simplefilter("always")
-        cs.vmax
-        assert len(w) == 1
-        msg = "vmax is deprecated and will be removed in 2.2 "
-        assert str(w[0].message).startswith(msg)
-
-
 def test_contourf_symmetric_locator():
     # github issue 7271
     z = np.arange(12).reshape((3, 4))
