MNT Put back and properly deprecate MaskedArray (#17199)

NicolasHug · adrinjalali · commit 29b366e7dd59 · 2020-05-19T10:00:50.000+02:00
diff --git a/sklearn/utils/fixes.py b/sklearn/utils/fixes.py
@@ -17,6 +17,9 @@
 import scipy
 import scipy.stats
 from scipy.sparse.linalg import lsqr as sparse_lsqr  # noqa
+from numpy.ma import MaskedArray as _MaskedArray  # TODO: remove in 0.25
+
+from .deprecation import deprecated
 
 
 def _parse_version(version_string):
@@ -154,3 +157,11 @@ class loguniform(scipy.stats.reciprocal):
     >>> rvs.max()  # doctest: +SKIP
     9.97403052786026
     """
+
+
+@deprecated(
+    'MaskedArray is deprecated in version 0.23 and will be removed in version '
+    '0.25. Use numpy.ma.MaskedArray instead.'
+)
+class MaskedArray(_MaskedArray):
+    pass  # TODO: remove in 0.25
diff --git a/sklearn/utils/tests/test_fixes.py b/sklearn/utils/tests/test_fixes.py
@@ -14,6 +14,7 @@
 from sklearn.utils.fixes import _joblib_parallel_args
 from sklearn.utils.fixes import _object_dtype_isnan
 from sklearn.utils.fixes import loguniform
+from sklearn.utils.fixes import MaskedArray
 
 
 @pytest.mark.parametrize('joblib_version', ('0.11', '0.12.0'))
@@ -83,3 +84,8 @@ def test_loguniform(low, high, base):
         loguniform(base ** low, base ** high).rvs(random_state=0)
         == loguniform(base ** low, base ** high).rvs(random_state=0)
     )
+
+
+def test_masked_array_deprecated():  # TODO: remove in 0.25
+    with pytest.warns(FutureWarning, match='is deprecated'):
+        MaskedArray()
