From 0f70c1477c2c6460702e88e466cc95c369ff7fd5 Mon Sep 17 00:00:00 2001 From: marhmpa Date: Tue, 24 Dec 2024 23:34:51 +0330 Subject: [PATCH 1/4] fixed pivot_table sort argument in pandas_stubs --- pandas-stubs/core/frame.pyi | 1 + tests/test_frame.py | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/pandas-stubs/core/frame.pyi b/pandas-stubs/core/frame.pyi index 7b5a80799..c155ed858 100644 --- a/pandas-stubs/core/frame.pyi +++ b/pandas-stubs/core/frame.pyi @@ -1295,6 +1295,7 @@ class DataFrame(NDFrame, OpsMixin): dropna: _bool = ..., margins_name: _str = ..., observed: _bool = ..., + sort: _bool = True, ) -> DataFrame: ... @overload def stack( diff --git a/tests/test_frame.py b/tests/test_frame.py index d8cf99f84..61ed4dbc8 100644 --- a/tests/test_frame.py +++ b/tests/test_frame.py @@ -1087,6 +1087,16 @@ def test_types_pivot_table() -> None: pd.DataFrame, ) + def test_pivot_table_sort(): + df = DataFrame( + {'a': [1, 2], + 'b': [3, 4], + 'c': [5, 6], + 'd': [7, 8]} + ) + result = df.pivot_table(values='a', index='b', columns='c', sort=True) + assert result is not None + def test_types_groupby_as_index() -> None: """Test type of groupby.size method depending on `as_index`.""" From affdb26b6b3eee7fadd9b6c33ab6efe2c708d489 Mon Sep 17 00:00:00 2001 From: marhmpa Date: Tue, 24 Dec 2024 23:50:12 +0330 Subject: [PATCH 2/4] fixed pivot_table argument and test_pivot_table --- pandas-stubs/core/frame.pyi | 2 +- tests/test_frame.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas-stubs/core/frame.pyi b/pandas-stubs/core/frame.pyi index c155ed858..10f127b19 100644 --- a/pandas-stubs/core/frame.pyi +++ b/pandas-stubs/core/frame.pyi @@ -1295,7 +1295,7 @@ class DataFrame(NDFrame, OpsMixin): dropna: _bool = ..., margins_name: _str = ..., observed: _bool = ..., - sort: _bool = True, + sort: _bool = ..., ) -> DataFrame: ... @overload def stack( diff --git a/tests/test_frame.py b/tests/test_frame.py index 61ed4dbc8..4b3e89874 100644 --- a/tests/test_frame.py +++ b/tests/test_frame.py @@ -1094,8 +1094,8 @@ def test_pivot_table_sort(): 'c': [5, 6], 'd': [7, 8]} ) - result = df.pivot_table(values='a', index='b', columns='c', sort=True) - assert result is not None + check(assert_type(df.pivot_table(values='a', index='b', columns='c', sort=True), + pd.DataFrame), pd.DataFrame) def test_types_groupby_as_index() -> None: From dd2af98ab96b09cd0bbe0db32fbf28cfe338e625 Mon Sep 17 00:00:00 2001 From: marhmpa Date: Wed, 25 Dec 2024 00:30:04 +0330 Subject: [PATCH 3/4] replaced single-quote with double --- tests/test_frame.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/test_frame.py b/tests/test_frame.py index 4b3e89874..cb8603431 100644 --- a/tests/test_frame.py +++ b/tests/test_frame.py @@ -1088,14 +1088,16 @@ def test_types_pivot_table() -> None: ) def test_pivot_table_sort(): - df = DataFrame( - {'a': [1, 2], - 'b': [3, 4], - 'c': [5, 6], - 'd': [7, 8]} + df = pd.DataFrame( + {"a": [1, 2], + "b": [3, 4], + "c": [5, 6], + "d": [7, 8]} ) - check(assert_type(df.pivot_table(values='a', index='b', columns='c', sort=True), - pd.DataFrame), pd.DataFrame) + + + check(assert_type(df.pivot_table(values="a", index="b", columns="c" + , sort=True), pd.DataFrame), pd.DataFrame) def test_types_groupby_as_index() -> None: From 284e6bc9aef036c9dcdf013856914927ba7a6ddd Mon Sep 17 00:00:00 2001 From: marhmpa Date: Thu, 26 Dec 2024 12:20:08 +0330 Subject: [PATCH 4/4] applied pre-commit hooks formated lint code --- tests/test_frame.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/test_frame.py b/tests/test_frame.py index cb8603431..5ce029cfd 100644 --- a/tests/test_frame.py +++ b/tests/test_frame.py @@ -1087,17 +1087,16 @@ def test_types_pivot_table() -> None: pd.DataFrame, ) - def test_pivot_table_sort(): - df = pd.DataFrame( - {"a": [1, 2], - "b": [3, 4], - "c": [5, 6], - "d": [7, 8]} - ) +def test_pivot_table_sort(): + df = pd.DataFrame({"a": [1, 2], "b": [3, 4], "c": [5, 6], "d": [7, 8]}) - check(assert_type(df.pivot_table(values="a", index="b", columns="c" - , sort=True), pd.DataFrame), pd.DataFrame) + check( + assert_type( + df.pivot_table(values="a", index="b", columns="c", sort=True), pd.DataFrame + ), + pd.DataFrame, + ) def test_types_groupby_as_index() -> None: