Skip to content

Commit 17a246b

Browse files
committed
modified: pandas/tests/reshape/test_pivot.py
- Removed data manipulations from `expected` to prevent dependencies on other pandas methods.
1 parent f2e4cae commit 17a246b

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

pandas/tests/reshape/test_pivot.py

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2533,25 +2533,22 @@ def test_pivot_table_index_and_column_keys_with_nan(self, dropna):
25332533
data = {"row": [None, *range(4)], "col": [*range(4), None], "val": range(5)}
25342534
df = DataFrame(data)
25352535
result = df.pivot_table(values="val", index="row", columns="col", dropna=dropna)
2536-
e_index = [None, *range(4)]
2537-
e_columns = [*range(4), None]
2538-
e_data = np.zeros(shape=(5, 5))
2539-
e_data.fill(np.nan)
2540-
np.fill_diagonal(a=e_data, val=range(5))
2536+
e_axis = [*range(4), None]
2537+
nan = np.nan
2538+
e_data = [
2539+
[nan, 1.0, nan, nan, nan],
2540+
[nan, nan, 2.0, nan, nan],
2541+
[nan, nan, nan, 3.0, nan],
2542+
[nan, nan, nan, nan, 4.0],
2543+
[0.0, nan, nan, nan, nan],
2544+
]
25412545
expected = DataFrame(
25422546
data=e_data,
2543-
index=Index(data=e_index, name="row"),
2544-
columns=Index(data=e_columns, name="col"),
2545-
).sort_index()
2547+
index=Index(data=e_axis, name="row"),
2548+
columns=Index(data=e_axis, name="col"),
2549+
)
25462550
if dropna:
2547-
expected = (
2548-
# Drop null index/column keys.
2549-
expected.loc[expected.index.notna(), expected.columns.notna()]
2550-
# Drop null rows.
2551-
.dropna(axis="index", how="all")
2552-
# Drop null columns.
2553-
.dropna(axis="columns", how="all")
2554-
)
2551+
expected = expected.loc[[0, 1, 2], [1, 2, 3]]
25552552

25562553
tm.assert_frame_equal(left=result, right=expected)
25572554

0 commit comments

Comments
 (0)