Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate inplace in Categorical.remove_unused_categories #37918

Merged
merged 5 commits into from
Nov 18, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v1.2.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ Deprecations
- :meth:`Categorical.is_dtype_equal` and :meth:`CategoricalIndex.is_dtype_equal` are deprecated, will be removed in a future version (:issue:`37545`)
- :meth:`Series.slice_shift` and :meth:`DataFrame.slice_shift` are deprecated, use :meth:`Series.shift` or :meth:`DataFrame.shift` instead (:issue:`37601`)
- Partial slicing on unordered :class:`DatetimeIndexes` with keys, which are not in Index is deprecated and will be removed in a future version (:issue:`18531`)
- The ``inplace`` parameter of :meth:`Categorical.remove_unused_categories` is deprecated and will be removed in a future version (:issue:`37643`)

.. ---------------------------------------------------------------------------

Expand Down
21 changes: 15 additions & 6 deletions pandas/core/arrays/categorical.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from pandas._config import get_option

from pandas._libs import NaT, algos as libalgos, hashtable as htable
from pandas._libs.lib import no_default
from pandas._typing import ArrayLike, Dtype, Ordered, Scalar
from pandas.compat.numpy import function as nv
from pandas.util._decorators import cache_readonly, deprecate_kwarg
Expand Down Expand Up @@ -1046,7 +1047,7 @@ def remove_categories(self, removals, inplace=False):
new_categories, ordered=self.ordered, rename=False, inplace=inplace
)

def remove_unused_categories(self, inplace=False):
def remove_unused_categories(self, inplace=no_default):
"""
Remove categories which are not used.

Expand All @@ -1056,10 +1057,12 @@ def remove_unused_categories(self, inplace=False):
Whether or not to drop unused categories inplace or return a copy of
this categorical with unused categories dropped.

.. deprecated:: 1.2.0

Returns
-------
cat : Categorical or None
Categorical with unused categories dropped or None if ``inplace=True``.
Categorical with unused categories dropped.

See Also
--------
Expand All @@ -1069,8 +1072,15 @@ def remove_unused_categories(self, inplace=False):
remove_categories : Remove the specified categories.
set_categories : Set the categories to the specified ones.
"""
inplace = validate_bool_kwarg(inplace, "inplace")
cat = self if inplace else self.copy()
if inplace is not no_default:
warn(
"The `inplace` parameter in pandas.Categorical.remove_unused_categories"
" is deprecated and will be removed in a future version.",
FutureWarning,
stacklevel=2,
)

cat = self.copy()
idx, inv = np.unique(cat._codes, return_inverse=True)

if idx.size != 0 and idx[0] == -1: # na sentinel
Expand All @@ -1083,8 +1093,7 @@ def remove_unused_categories(self, inplace=False):
cat._dtype = new_dtype
cat._codes = coerce_indexer_dtype(inv, new_dtype.categories)

if not inplace:
return cat
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesnt get changed until we actually enforce the deprecation a few versions from now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

return cat

# ------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/arrays/categorical/test_analytics.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ def test_validate_inplace_raises(self, value):
with pytest.raises(ValueError, match=msg):
cat.remove_categories(removals=["D", "E", "F"], inplace=value)

with pytest.raises(ValueError, match=msg):
with tm.assert_produces_warning(FutureWarning):
cat.remove_unused_categories(inplace=value)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment inside this block about why we're getting a FutureWarning.

im guessing this actually needs both the raises and the produces_warning, ie.

with pytest.raises(ValueError, match=msg):
    with tm.assert_produces_warning(FutureWarning):
        # GH#37918 inplace kwarg deprecated
        cat.remove_unused_categories(inplace=value)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok


with pytest.raises(ValueError, match=msg):
Expand Down
5 changes: 2 additions & 3 deletions pandas/tests/arrays/categorical/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,8 @@ def test_remove_unused_categories(self):
tm.assert_index_equal(res.categories, exp_categories_dropped)
tm.assert_index_equal(c.categories, exp_categories_all)

res = c.remove_unused_categories(inplace=True)
tm.assert_index_equal(c.categories, exp_categories_dropped)
assert res is None
with tm.assert_produces_warning(FutureWarning):
c.remove_unused_categories(inplace=True)

# with NaN values (GH11599)
c = Categorical(["a", "b", "c", np.nan], categories=["a", "b", "c", "d", "e"])
Expand Down