Skip to content

Commit 49c1718

Browse files
committed
Update for Tuple type.
1 parent 842df30 commit 49c1718

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

bigframes/dataframe.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,17 +2085,17 @@ def pivot_table(
20852085
columns: typing.Union[blocks.Label, Sequence[blocks.Label]] = None,
20862086
aggfunc: str = "mean",
20872087
) -> DataFrame:
2088-
if isinstance(index, blocks.Label):
2088+
if isinstance(index, blocks.Label) and index in self.columns:
20892089
index = [index]
20902090
else:
20912091
index = list(index)
20922092

2093-
if isinstance(columns, blocks.Label):
2093+
if isinstance(columns, blocks.Label) and columns in self.columns:
20942094
columns = [columns]
20952095
else:
20962096
columns = list(columns)
20972097

2098-
if isinstance(values, blocks.Label):
2098+
if isinstance(values, blocks.Label) and values in self.columns:
20992099
values = [values]
21002100
else:
21012101
values = list(values)

tests/system/small/test_dataframe.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,8 +2557,8 @@ def test_df_pivot_hockey(hockey_df, hockey_pandas_df, values, index, columns):
25572557
@pytest.mark.parametrize(
25582558
("values", "index", "columns", "aggfunc"),
25592559
[
2560-
(["culmen_length_mm", "body_mass_g"], "species", "sex", "std"),
2561-
(["body_mass_g", "culmen_length_mm"], ["species", "island"], "sex", "sum"),
2560+
(("culmen_length_mm", "body_mass_g"), "species", "sex", "std"),
2561+
(["body_mass_g", "culmen_length_mm"], ("species", "island"), "sex", "sum"),
25622562
("body_mass_g", "sex", ["island", "species"], "mean"),
25632563
("culmen_depth_mm", "island", "species", "max"),
25642564
],

third_party/bigframes_vendored/pandas/core/frame.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4732,6 +4732,7 @@ def pivot_table(self, values=None, index=None, columns=None, aggfunc="mean"):
47324732
47334733
columns (str or object or a list of str):
47344734
Column to use to make new frame's columns.
4735+
47354736
aggfunc (str, default "mean"):
47364737
Aggregation function name to compute summary statistics (e.g., 'sum', 'mean').
47374738

0 commit comments

Comments
 (0)