Skip to content

Commit

Permalink
Revert "FIX-modin-project#4154: add value_counts method for SeriesGro…
Browse files Browse the repository at this point in the history
…upBy and DataFrameGroupBy (modin-project#5453)"

This reverts commit 08dd22b.
  • Loading branch information
jkew committed Feb 22, 2023
1 parent 08dd22b commit c8c2362
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 46 deletions.
36 changes: 0 additions & 36 deletions modin/pandas/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,24 +137,6 @@ def sem(self, ddof=1):
numeric_only=True,
)

def value_counts(
self,
subset=None,
normalize: bool = False,
sort: bool = True,
ascending: bool = False,
dropna: bool = True,
):
return self._default_to_pandas(
lambda df: df.value_counts(
subset=subset,
normalize=normalize,
sort=sort,
ascending=ascending,
dropna=dropna,
)
)

def mean(self, numeric_only=None):
return self._check_index(
self._wrap_aggregation(
Expand Down Expand Up @@ -1356,24 +1338,6 @@ def nsmallest(self, n=5, keep="first"):
numeric_only=True,
)
)

def value_counts(
self,
normalize: bool = False,
sort: bool = True,
ascending: bool = False,
bins=None,
dropna: bool = True,
):
return self._default_to_pandas(
lambda ser: ser.value_counts(
normalize=normalize,
sort=sort,
ascending=ascending,
bins=bins,
dropna=dropna,
)
)


if IsExperimental.get():
Expand Down
11 changes: 1 addition & 10 deletions modin/pandas/test/test_groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ def test_mixed_dtypes_groupby(as_index):
eval_sum(modin_groupby, pandas_groupby)
eval_ngroup(modin_groupby, pandas_groupby)
eval_nunique(modin_groupby, pandas_groupby)
eval_value_counts(modin_groupby, pandas_groupby)
eval_median(modin_groupby, pandas_groupby)
eval_general(modin_groupby, pandas_groupby, lambda df: df.head(n))
eval_cumprod(modin_groupby, pandas_groupby)
Expand Down Expand Up @@ -626,7 +625,6 @@ def test_single_group_row_groupby():
eval_sum(modin_groupby, pandas_groupby)
eval_ngroup(modin_groupby, pandas_groupby)
eval_nunique(modin_groupby, pandas_groupby)
eval_value_counts(modin_groupby, pandas_groupby)
eval_median(modin_groupby, pandas_groupby)
eval_general(modin_groupby, pandas_groupby, lambda df: df.head(n))
eval_cumprod(modin_groupby, pandas_groupby)
Expand Down Expand Up @@ -745,7 +743,6 @@ def test_large_row_groupby(is_by_category):
eval_sum(modin_groupby, pandas_groupby)
eval_ngroup(modin_groupby, pandas_groupby)
eval_nunique(modin_groupby, pandas_groupby)
eval_value_counts(modin_groupby, pandas_groupby)
eval_median(modin_groupby, pandas_groupby)
eval_general(modin_groupby, pandas_groupby, lambda df: df.head(n))
# eval_cumprod(modin_groupby, pandas_groupby) causes overflows
Expand Down Expand Up @@ -853,8 +850,6 @@ def test_simple_col_groupby():
# Pandas fails on this case with ValueError
# eval_ngroup(modin_groupby, pandas_groupby)
# eval_nunique(modin_groupby, pandas_groupby)
# NotImplementedError: DataFrameGroupBy.value_counts only handles axis=0
# eval_value_counts(modin_groupby, pandas_groupby)
eval_median(modin_groupby, pandas_groupby)
eval_general(
modin_groupby,
Expand Down Expand Up @@ -981,7 +976,6 @@ def test_series_groupby(by, as_index_series_or_dataframe):
eval_size(modin_groupby, pandas_groupby)
eval_ngroup(modin_groupby, pandas_groupby)
eval_nunique(modin_groupby, pandas_groupby)
eval_value_counts(modin_groupby, pandas_groupby)
eval_median(modin_groupby, pandas_groupby)
eval_general(modin_groupby, pandas_groupby, lambda df: df.head(n))
eval_cumprod(modin_groupby, pandas_groupby)
Expand Down Expand Up @@ -1138,10 +1132,7 @@ def eval_nunique(modin_groupby, pandas_groupby):
df_equals(modin_groupby.nunique(), pandas_groupby.nunique())


def eval_value_counts(modin_groupby, pandas_groupby):
df_equals(modin_groupby.value_counts(), pandas_groupby.value_counts())


@_copy_pandas_groupby_if_needed
def eval_median(modin_groupby, pandas_groupby):
modin_df_almost_equals_pandas(modin_groupby.median(), pandas_groupby.median())

Expand Down

0 comments on commit c8c2362

Please sign in to comment.