Remove mlab.contiguous_regions

dstansby · dstansby · commit 6ae60586c14b · 2018-09-29T11:05:07.000+01:00
diff --git a/doc/api/next_api_changes/2018-09-18-DS.rst b/doc/api/next_api_changes/2018-09-18-DS.rst
@@ -34,4 +34,5 @@ in Matplotlib 2.2 has been removed. See below for a list:
 - `mlab.path_length`
 - `mlab.cross_from_above`
 - `mlab.cross_from_below`
+- `mlab.contiguous_regions` (use `.cbook.contiguous_regions` instead)
 - `mlab.donothing_callback`
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2755,12 +2755,3 @@ def is_closed_polygon(X):
     tests if that curve is closed.
     """
     return np.all(X[0] == X[-1])
-
-
-@cbook.deprecated("2.2", message='Moved to matplotlib.cbook')
-def contiguous_regions(mask):
-    """
-    return a list of (ind0, ind1) such that mask[ind0:ind1].all() is
-    True and we cover all such regions
-    """
-    return cbook.contiguous_regions(mask)
diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py
@@ -503,3 +503,26 @@ class dummy():
     x = np.random.rand(3, 5)
     xnew = cbook._reshape_2D(x, 'x')
     assert np.shape(xnew) == (5, 3)
+
+
+def test_contiguous_regions():
+    a, b, c = 3, 4, 5
+    # Starts and ends with True
+    mask = [True]*a + [False]*b + [True]*c
+    expected = [(0, a), (a+b, a+b+c)]
+    assert cbook.contiguous_regions(mask) == expected
+    d, e = 6, 7
+    # Starts with True ends with False
+    mask = mask + [False]*e
+    assert cbook.contiguous_regions(mask) == expected
+    # Starts with False ends with True
+    mask = [False]*d + mask[:-e]
+    expected = [(d, d+a), (d+a+b, d+a+b+c)]
+    assert cbook.contiguous_regions(mask) == expected
+    # Starts and ends with False
+    mask = mask + [False]*e
+    assert cbook.contiguous_regions(mask) == expected
+    # No True in mask
+    assert cbook.contiguous_regions([False]*5) == []
+    # Empty mask
+    assert cbook.contiguous_regions([]) == []
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -2274,33 +2274,6 @@ def test_evaluate_equal_dim_and_num_lt(self):
         np.testing.assert_array_almost_equal(y, y_expected, 7)
 
 
-def test_contiguous_regions():
-    a, b, c = 3, 4, 5
-    # Starts and ends with True
-    mask = [True]*a + [False]*b + [True]*c
-    expected = [(0, a), (a+b, a+b+c)]
-    with pytest.warns(MatplotlibDeprecationWarning):
-        assert mlab.contiguous_regions(mask) == expected
-    d, e = 6, 7
-    # Starts with True ends with False
-    mask = mask + [False]*e
-    with pytest.warns(MatplotlibDeprecationWarning):
-        assert mlab.contiguous_regions(mask) == expected
-    # Starts with False ends with True
-    mask = [False]*d + mask[:-e]
-    expected = [(d, d+a), (d+a+b, d+a+b+c)]
-    with pytest.warns(MatplotlibDeprecationWarning):
-        assert mlab.contiguous_regions(mask) == expected
-    # Starts and ends with False
-    mask = mask + [False]*e
-    with pytest.warns(MatplotlibDeprecationWarning):
-        assert mlab.contiguous_regions(mask) == expected
-        # No True in mask
-        assert mlab.contiguous_regions([False]*5) == []
-        # Empty mask
-        assert mlab.contiguous_regions([]) == []
-
-
 def test_psd_onesided_norm():
     u = np.array([0, 1, 2, 3, 1, 2, 1])
     dt = 1.0
