From 5b91b0fbb4baf2f4b08e705a49fd23fbde55a98a Mon Sep 17 00:00:00 2001 From: Stelios Petrakis <92467926+steliospetrakis02@users.noreply.github.com> Date: Mon, 3 Apr 2023 11:01:04 +0300 Subject: [PATCH 1/6] Add a test for agg std --- pandas/tests/groupby/aggregate/test_aggregate.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandas/tests/groupby/aggregate/test_aggregate.py b/pandas/tests/groupby/aggregate/test_aggregate.py index dca0281d610ad..85da3c2528a6d 100644 --- a/pandas/tests/groupby/aggregate/test_aggregate.py +++ b/pandas/tests/groupby/aggregate/test_aggregate.py @@ -1577,3 +1577,9 @@ def test_agg_groupings_selection(): ) expected = DataFrame({"b": [6, 4], "c": [11, 7]}, index=index) tm.assert_frame_equal(result, expected) + +def test_agg_std(): + df = pd.DataFrame({'A': [1, 2, 3], 'B': [4, 5, 6]}) + std = df.agg(np.std) + expected = pd.Series({'A': 1.0, 'B': 1.0}, dtype=float) + assert std.equals(expected) From 71e046c3985bfa42e7589ae4f2b49d52444a525f Mon Sep 17 00:00:00 2001 From: Stelios Petrakis <92467926+steliospetrakis02@users.noreply.github.com> Date: Mon, 3 Apr 2023 22:55:54 +0300 Subject: [PATCH 2/6] move the test as requested and added one more test for df.agg([np.std]) --- pandas/tests/apply/test_frame_apply.py | 10 ++++++++++ pandas/tests/groupby/aggregate/test_aggregate.py | 5 ----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pandas/tests/apply/test_frame_apply.py b/pandas/tests/apply/test_frame_apply.py index c7eb8c0332e84..5f17c7dfc998b 100644 --- a/pandas/tests/apply/test_frame_apply.py +++ b/pandas/tests/apply/test_frame_apply.py @@ -1665,3 +1665,13 @@ def foo2(x, b=2, c=0): columns=MultiIndex.from_tuples([("x", "foo1"), ("x", "foo2")]), ) tm.assert_frame_equal(result, expected) + +def test_agg_std(): + df = pd.DataFrame(np.arange(6).reshape(3, 2), columns=['A', 'B']) + + result = df.agg(np.std) + expected = pd.Series({'A': 2.0, 'B': 2.0}, dtype=float) + tm.assert_series_equal(result, expected) + + result = df.agg([np.std]) + assert isinstance(result, pd.DataFrame) diff --git a/pandas/tests/groupby/aggregate/test_aggregate.py b/pandas/tests/groupby/aggregate/test_aggregate.py index 85da3c2528a6d..961db53b90b19 100644 --- a/pandas/tests/groupby/aggregate/test_aggregate.py +++ b/pandas/tests/groupby/aggregate/test_aggregate.py @@ -1578,8 +1578,3 @@ def test_agg_groupings_selection(): expected = DataFrame({"b": [6, 4], "c": [11, 7]}, index=index) tm.assert_frame_equal(result, expected) -def test_agg_std(): - df = pd.DataFrame({'A': [1, 2, 3], 'B': [4, 5, 6]}) - std = df.agg(np.std) - expected = pd.Series({'A': 1.0, 'B': 1.0}, dtype=float) - assert std.equals(expected) From a69083f41a9b960aa201ac4c25873c8019b738a3 Mon Sep 17 00:00:00 2001 From: Stelios Petrakis <92467926+steliospetrakis02@users.noreply.github.com> Date: Tue, 4 Apr 2023 01:12:22 +0300 Subject: [PATCH 3/6] fix second test --- pandas/tests/apply/test_frame_apply.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/apply/test_frame_apply.py b/pandas/tests/apply/test_frame_apply.py index 5f17c7dfc998b..deac0a104bff8 100644 --- a/pandas/tests/apply/test_frame_apply.py +++ b/pandas/tests/apply/test_frame_apply.py @@ -1674,4 +1674,5 @@ def test_agg_std(): tm.assert_series_equal(result, expected) result = df.agg([np.std]) - assert isinstance(result, pd.DataFrame) + expected = pd.DataFrame({'A': 2.0, 'B': 2.0}, index=['std']) + tm.assert_frame_equal(result, expected) From 246d9c68927aa8e3d7ac25efb773684468aec64b Mon Sep 17 00:00:00 2001 From: Stelios Petrakis <92467926+steliospetrakis02@users.noreply.github.com> Date: Tue, 4 Apr 2023 01:32:05 +0300 Subject: [PATCH 4/6] fix format --- pandas/tests/apply/test_frame_apply.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pandas/tests/apply/test_frame_apply.py b/pandas/tests/apply/test_frame_apply.py index deac0a104bff8..3207ff530c3ba 100644 --- a/pandas/tests/apply/test_frame_apply.py +++ b/pandas/tests/apply/test_frame_apply.py @@ -1666,13 +1666,14 @@ def foo2(x, b=2, c=0): ) tm.assert_frame_equal(result, expected) + def test_agg_std(): - df = pd.DataFrame(np.arange(6).reshape(3, 2), columns=['A', 'B']) + df = pd.DataFrame(np.arange(6).reshape(3, 2), columns=["A", "B"]) result = df.agg(np.std) - expected = pd.Series({'A': 2.0, 'B': 2.0}, dtype=float) - tm.assert_series_equal(result, expected) + expected = pd.Series({"A": 2.0, "B": 2.0}, dtype=float) + tm.assert_series_equal(result, expected) result = df.agg([np.std]) - expected = pd.DataFrame({'A': 2.0, 'B': 2.0}, index=['std']) + expected = pd.DataFrame({"A": 2.0, "B": 2.0}, index=["std"]) tm.assert_frame_equal(result, expected) From d948779af4c0430a2db1cf97ad54a5bcea3df120 Mon Sep 17 00:00:00 2001 From: Stelios Petrakis <92467926+steliospetrakis02@users.noreply.github.com> Date: Tue, 4 Apr 2023 01:40:45 +0300 Subject: [PATCH 5/6] Update test_aggregate.py --- pandas/tests/groupby/aggregate/test_aggregate.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/tests/groupby/aggregate/test_aggregate.py b/pandas/tests/groupby/aggregate/test_aggregate.py index 961db53b90b19..dca0281d610ad 100644 --- a/pandas/tests/groupby/aggregate/test_aggregate.py +++ b/pandas/tests/groupby/aggregate/test_aggregate.py @@ -1577,4 +1577,3 @@ def test_agg_groupings_selection(): ) expected = DataFrame({"b": [6, 4], "c": [11, 7]}, index=index) tm.assert_frame_equal(result, expected) - From 25b97fefc9be8ab04793089105d5982308f3454e Mon Sep 17 00:00:00 2001 From: Stelios Petrakis <92467926+steliospetrakis02@users.noreply.github.com> Date: Tue, 4 Apr 2023 01:52:45 +0300 Subject: [PATCH 6/6] Update test_frame_apply.py --- pandas/tests/apply/test_frame_apply.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/apply/test_frame_apply.py b/pandas/tests/apply/test_frame_apply.py index 3207ff530c3ba..f0f8b3befadcb 100644 --- a/pandas/tests/apply/test_frame_apply.py +++ b/pandas/tests/apply/test_frame_apply.py @@ -1668,12 +1668,12 @@ def foo2(x, b=2, c=0): def test_agg_std(): - df = pd.DataFrame(np.arange(6).reshape(3, 2), columns=["A", "B"]) + df = DataFrame(np.arange(6).reshape(3, 2), columns=["A", "B"]) result = df.agg(np.std) - expected = pd.Series({"A": 2.0, "B": 2.0}, dtype=float) + expected = Series({"A": 2.0, "B": 2.0}, dtype=float) tm.assert_series_equal(result, expected) result = df.agg([np.std]) - expected = pd.DataFrame({"A": 2.0, "B": 2.0}, index=["std"]) + expected = DataFrame({"A": 2.0, "B": 2.0}, index=["std"]) tm.assert_frame_equal(result, expected)