8000 MNT Put back and properly deprecate MaskedArray (#17199) · scikit-learn/scikit-learn@29b366e · GitHub
[go: up one dir, main page]

Skip to content

Commit 29b366e

Browse files
NicolasHugadrinjalali
authored andcommitted
MNT Put back and properly deprecate MaskedArray (#17199)
1 parent 420faf7 commit 29b366e

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

sklearn/utils/fixes.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
import scipy
1818
import scipy.stats
1919
from scipy.sparse.linalg import lsqr as sparse_lsqr # noqa
20+
from numpy.ma import MaskedArray as _MaskedArray # TODO: remove in 0.25
21+
22+
from .deprecation import deprecated
2023

2124

2225
def _parse_version(version_string):
@@ -154,3 +157,11 @@ class loguniform(scipy.stats.reciprocal):
154157
>>> rvs.max() # doctest: +SKIP
155158
9.97403052786026
156159
"""
160+
161+
162+
@deprecated(
163+
'MaskedArray is deprecated in version 0.23 and will be removed in version '
164+
'0.25. Use numpy.ma.MaskedArray instead.'
165+
)
166+
class MaskedArray(_MaskedArray):
167+
pass # TODO: remove in 0.25

sklearn/utils/tests/test_fixes.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from sklearn.utils.fixes import _joblib_parallel_args
1515
from sklearn.utils.fixes import _object_dtype_isnan
1616
from sklearn.utils.fixes import loguniform
17+
from sklearn.utils.fixes import MaskedArray
1718

1819

1920
@pytest.mark.parametrize('joblib_version', ('0.11', '0.12.0'))
@@ -83,3 +84,8 @@ def test_loguniform(low, high, base):
8384
loguniform(base ** low, base ** high).rvs(ra 5ADD ndom_state=0)
8485
== loguniform(base ** low, base ** high).rvs(random_state=0)
8586
)
87+
88+
89+
def test_masked_array_deprecated(): # TODO: remove in 0.25
90+
with pytest.warns(FutureWarning, match='is deprecated'):
91+
MaskedArray()

0 commit comments

Comments
 (0)
0