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

chore(python): Properly deprecate groupby.pivot #6000

Merged
merged 1 commit into from
Jan 3, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
9 changes: 9 additions & 0 deletions py-polars/polars/internals/dataframe/groupby.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,9 @@ def pivot(
The pivot operation is based on the group key, a pivot column and an aggregation
function on the values column.

.. deprecated:: 0.13.23
`DataFrame.groupby.pivot` will be removed in favour of `DataFrame.pivot`.

Parameters
----------
pivot_column
Expand Down Expand Up @@ -449,6 +452,12 @@ def pivot(
└─────┴─────┴─────┴─────┘

"""
warnings.warn(
"`DataFrame.groupby.pivot` is deprecated and will be removed in a future"
" version. Use `DataFrame.pivot` instead.",
DeprecationWarning,
stacklevel=2,
)
if isinstance(pivot_column, str):
pivot_column = [pivot_column]
if isinstance(values_column, str):
Expand Down
31 changes: 18 additions & 13 deletions py-polars/tests/unit/test_df.py
Original file line number Diff line number Diff line change
Expand Up @@ -2086,10 +2086,11 @@ class SubClassedDataFrame(pl.DataFrame):
)

# Round-trips to PivotOps and back should also preserve subclass
assert isinstance(
groupby.pivot(pivot_column="a", values_column="b").first(),
SubClassedDataFrame,
)
with pytest.deprecated_call():
assert isinstance(
groupby.pivot(pivot_column="a", values_column="b").first(),
SubClassedDataFrame,
)


def test_explode_empty() -> None:
Expand Down Expand Up @@ -2493,15 +2494,19 @@ def test_glimpse() -> None:
)
result = df.glimpse()

expected = """Rows: 3
Columns: 6
$ a <Float64> 1.0, 2.8, 3.0
$ b <Int64> 4, 5, None
$ c <Boolean> True, False, True
$ d <Utf8> None, b, c
$ e <Utf8> usd, eur, None
$ f <Date> 2020-01-01, 2021-01-02, 2022-01-01"""
assert result.strip() == expected
# Strip trailing whitespace for the purposes of this test
result_lines = [line.strip() for line in result.strip().split("\n")]
expected_lines = [
"Rows: 3",
"Columns: 6",
"$ a <Float64> 1.0, 2.8, 3.0",
"$ b <Int64> 4, 5, None",
"$ c <Boolean> True, False, True",
"$ d <Utf8> None, b, c",
"$ e <Utf8> usd, eur, None",
"$ f <Date> 2020-01-01, 2021-01-02, 2022-01-01",
]
assert result_lines == expected_lines


def test_item() -> None:
Expand Down
16 changes: 11 additions & 5 deletions py-polars/tests/unit/test_pivot.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

from typing import TYPE_CHECKING

import pytest

import polars as pl

if TYPE_CHECKING:
Expand Down Expand Up @@ -31,10 +33,12 @@ def test_pivot() -> None:
"c": [2, 4, None, 8, 10],
}
)
gb = df.groupby("b").pivot(
pivot_column="a",
values_column="c",
)

with pytest.deprecated_call():
gb = df.groupby("b").pivot(
pivot_column="a",
values_column="c",
)
assert gb.count().rows() == [("a", 2, None, None), ("b", None, 2, 1)]
assert gb.first().rows() == [("a", 2, None, None), ("b", None, None, 10)]
assert gb.max().rows() == [("a", 4, None, None), ("b", None, 8, 10)]
Expand All @@ -59,7 +63,9 @@ def test_pivot() -> None:
"bar": ["k", "l", "m", "n", "o"],
}
)
out = df.groupby("foo").pivot(pivot_column="bar", values_column="N").first()
with pytest.deprecated_call():
out = df.groupby("foo").pivot(pivot_column="bar", values_column="N").first()

assert out.shape == (3, 6)
assert out.rows() == [
("A", 1, 2, None, None, None),
Expand Down