From 8c5fed996ed06e6bdde66e8f9a834607cc5a8fbd Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Tue, 12 Jul 2022 16:31:36 -0400 Subject: [PATCH 01/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index ead4ea744c647..8d25017ae81d7 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,6 +8332,14 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 + +When using ``.groupby()`` on a multiple index dataframe, do not specify both ``by`` and ``level``. +The argument validation should be done in ``.groupby()``, using the name of the specific index. + +>>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) +>>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], [1, 2, 1]], names=["x", "y"]) +>>> df.groupby(["col1", "x"]) # Fine +>>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From 25ddc0ca9e7d68814f4fdacb64b503c95c19bb26 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Tue, 12 Jul 2022 16:46:01 -0400 Subject: [PATCH 02/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index ead4ea744c647..94a292c381ea9 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,6 +8332,18 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 + +When using ``.groupby()`` on a multiple index dataframe, do not specify both +``by`` and ``level``. +The argument validation should be done in ``.groupby()``, +using the name of the specific index. + +>>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) +>>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], +... [1, 2, 1]], +... names=["x", "y"]) +>>> df.groupby(["col1", "x"]) # Fine +>>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From 8ac46b74cd53e274a3cc11a2fd44167dedba187a Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Tue, 12 Jul 2022 16:48:23 -0400 Subject: [PATCH 03/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 8d25017ae81d7..1de871942aeb1 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8333,11 +8333,15 @@ def update( 2 Parrot 24.0 3 Parrot 26.0 -When using ``.groupby()`` on a multiple index dataframe, do not specify both ``by`` and ``level``. -The argument validation should be done in ``.groupby()``, using the name of the specific index. +When using ``.groupby()`` on a multiple index dataframe, +do not specify both ``by`` and ``level``. +The argument validation should be done in instead be done in +``.groupby()``, using the name of the specific index. >>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) ->>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], [1, 2, 1]], names=["x", "y"]) +>>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], +... [1, 2, 1]], +... names=["x", "y"]) >>> df.groupby(["col1", "x"]) # Fine >>> df.groupby("col1", level=0) # TypeError """ From 28cb2bb034f81af974874e2372959515b5751780 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Tue, 12 Jul 2022 16:59:55 -0400 Subject: [PATCH 04/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 1de871942aeb1..9c66086846206 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8333,14 +8333,14 @@ def update( 2 Parrot 24.0 3 Parrot 26.0 -When using ``.groupby()`` on a multiple index dataframe, -do not specify both ``by`` and ``level``. -The argument validation should be done in instead be done in +When using ``.groupby()`` on a multiple index dataframe, +do not specify both ``by`` and ``level``. +The argument validation should be done in instead be done in ``.groupby()``, using the name of the specific index. >>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) ->>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], -... [1, 2, 1]], +>>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], +... [1, 2, 1]], ... names=["x", "y"]) >>> df.groupby(["col1", "x"]) # Fine >>> df.groupby("col1", level=0) # TypeError From 477bde67aa61d8db8edaf2bb3bd0d45f239a1093 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Tue, 12 Jul 2022 17:33:46 -0400 Subject: [PATCH 05/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 9c66086846206..166372bb84fdd 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8333,12 +8333,16 @@ def update( 2 Parrot 24.0 3 Parrot 26.0 + + + When using ``.groupby()`` on a multiple index dataframe, do not specify both ``by`` and ``level``. The argument validation should be done in instead be done in ``.groupby()``, using the name of the specific index. >>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) + >>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], ... [1, 2, 1]], ... names=["x", "y"]) From 1b39a256346cd606f40206b8f567027b9808791c Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Tue, 12 Jul 2022 18:38:08 -0400 Subject: [PATCH 06/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 166372bb84fdd..06ac9fcac07d2 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8333,9 +8333,6 @@ def update( 2 Parrot 24.0 3 Parrot 26.0 - - - When using ``.groupby()`` on a multiple index dataframe, do not specify both ``by`` and ``level``. The argument validation should be done in instead be done in From 53b122d75ee3cc2742145dfb56968aff4aa1484b Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Tue, 12 Jul 2022 20:00:25 -0400 Subject: [PATCH 07/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 14 ++++++++++++++ pandas/core/frame.py | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 5d8ef7ce02097..5aa627ad49783 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -343,6 +343,20 @@ Index level names may be supplied as keys. s.groupby(["first", "second"]).sum() +When using ``.groupby()`` on a multiple index dataframe, do not specify both +``by`` and ``level``. +The argument validation should be done in ``.groupby()``, +using the name of the specific index. + +.. ipyton:: python + + df = pandas.DataFrame({"col1": ["a", "b", "c"]}) + df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], + [1, 2, 1]], + names=["x", "y"]) + df.groupby(["col1", "x"]) # Fine + df.groupby("col1", level=0) # TypeError + More on the ``sum`` function and aggregation later. Grouping DataFrame with Index levels and columns diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 94a292c381ea9..ead4ea744c647 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,18 +8332,6 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 - -When using ``.groupby()`` on a multiple index dataframe, do not specify both -``by`` and ``level``. -The argument validation should be done in ``.groupby()``, -using the name of the specific index. - ->>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) ->>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], -... [1, 2, 1]], -... names=["x", "y"]) ->>> df.groupby(["col1", "x"]) # Fine ->>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From 5e758c5758c7a7caec7ef9dbee1dc7f5689af72e Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 10:43:25 -0400 Subject: [PATCH 08/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 06ac9fcac07d2..31f1aa94fe99e 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8337,14 +8337,6 @@ def update( do not specify both ``by`` and ``level``. The argument validation should be done in instead be done in ``.groupby()``, using the name of the specific index. - ->>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) - ->>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], -... [1, 2, 1]], -... names=["x", "y"]) ->>> df.groupby(["col1", "x"]) # Fine ->>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From 46af7531beecdd9ffca29f2fce8d6ee1ad6c17ad Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 11:15:31 -0400 Subject: [PATCH 09/23] Revert "updated the docstring in accordance with GH40378" This reverts commit 53b122d75ee3cc2742145dfb56968aff4aa1484b. --- doc/source/user_guide/groupby.rst | 14 -------------- pandas/core/frame.py | 12 ++++++++++++ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 5aa627ad49783..5d8ef7ce02097 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -343,20 +343,6 @@ Index level names may be supplied as keys. s.groupby(["first", "second"]).sum() -When using ``.groupby()`` on a multiple index dataframe, do not specify both -``by`` and ``level``. -The argument validation should be done in ``.groupby()``, -using the name of the specific index. - -.. ipyton:: python - - df = pandas.DataFrame({"col1": ["a", "b", "c"]}) - df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], - [1, 2, 1]], - names=["x", "y"]) - df.groupby(["col1", "x"]) # Fine - df.groupby("col1", level=0) # TypeError - More on the ``sum`` function and aggregation later. Grouping DataFrame with Index levels and columns diff --git a/pandas/core/frame.py b/pandas/core/frame.py index ead4ea744c647..94a292c381ea9 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,6 +8332,18 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 + +When using ``.groupby()`` on a multiple index dataframe, do not specify both +``by`` and ``level``. +The argument validation should be done in ``.groupby()``, +using the name of the specific index. + +>>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) +>>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], +... [1, 2, 1]], +... names=["x", "y"]) +>>> df.groupby(["col1", "x"]) # Fine +>>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From cd1a30bef175cc81de4d5d890d89dee272ed2f3a Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 11:16:11 -0400 Subject: [PATCH 10/23] Revert "updated the docstring in accordance with GH40378" This reverts commit 5e758c5758c7a7caec7ef9dbee1dc7f5689af72e. --- pandas/core/frame.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 31f1aa94fe99e..06ac9fcac07d2 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8337,6 +8337,14 @@ def update( do not specify both ``by`` and ``level``. The argument validation should be done in instead be done in ``.groupby()``, using the name of the specific index. + +>>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) + +>>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], +... [1, 2, 1]], +... names=["x", "y"]) +>>> df.groupby(["col1", "x"]) # Fine +>>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From a9c931bfebd945f00af8748b5c920aaa4e4d8f58 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 11:19:06 -0400 Subject: [PATCH 11/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 06ac9fcac07d2..ead4ea744c647 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,19 +8332,6 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 - -When using ``.groupby()`` on a multiple index dataframe, -do not specify both ``by`` and ``level``. -The argument validation should be done in instead be done in -``.groupby()``, using the name of the specific index. - ->>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) - ->>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], -... [1, 2, 1]], -... names=["x", "y"]) ->>> df.groupby(["col1", "x"]) # Fine ->>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From 7373884ed4ed2cf24c09d2972e7f85f35de42fd0 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 11:20:02 -0400 Subject: [PATCH 12/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 94a292c381ea9..ead4ea744c647 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,18 +8332,6 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 - -When using ``.groupby()`` on a multiple index dataframe, do not specify both -``by`` and ``level``. -The argument validation should be done in ``.groupby()``, -using the name of the specific index. - ->>> df = pandas.DataFrame({"col1": ["a", "b", "c"]}) ->>> df.index = pandas.MultiIndex.from_arrays([["a", "a", "b"], -... [1, 2, 1]], -... names=["x", "y"]) ->>> df.groupby(["col1", "x"]) # Fine ->>> df.groupby("col1", level=0) # TypeError """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From 30b1acfcf6d944ffb0c4ac5098b92671abc738ce Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 17:50:59 -0400 Subject: [PATCH 13/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index ead4ea744c647..81398b17e2fd3 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,6 +8332,7 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 + """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From 6c3c46a56be2b9407b62aa9dc16ba267ab36ae61 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 17:52:49 -0400 Subject: [PATCH 14/23] updated the docstring in accordance with GH40378 --- pandas/core/frame.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 81398b17e2fd3..ead4ea744c647 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8332,7 +8332,6 @@ def update( 1 Falcon 370.0 2 Parrot 24.0 3 Parrot 26.0 - """ ) @Appender(_shared_docs["groupby"] % _shared_doc_kwargs) From ece2955dca46f107c335efbbf1a04e111572b34a Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 18:57:29 -0400 Subject: [PATCH 15/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 5d8ef7ce02097..ebd0bd5cf6dbb 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -274,15 +274,6 @@ the length of the ``groups`` dict, so it is largely just a convenience: df gb = df.groupby("gender") - -.. ipython:: - - @verbatim - In [1]: gb. # noqa: E225, E999 - gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform - gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var - gb.apply gb.cummax gb.cumsum gb.fillna gb.gender gb.head gb.indices gb.mean gb.name gb.ohlc gb.quantile gb.size gb.tail gb.weight - .. _groupby.multiindex: GroupBy with MultiIndex @@ -345,6 +336,16 @@ Index level names may be supplied as keys. More on the ``sum`` function and aggregation later. +When using ``.groupby()`` on a DatFrame with a MultiIndex, do not specify both ``by`` and ``level``. +The argument validation should be done in ``.groupby()``, using the name of the specific index. + +.. ipython:: python + + df = pd.DataFrame({"col1": ["a", "b", "c"]}) + df.index = pd.MultiIndex.from_arrays([["a", "a", "b"], + [1, 2, 1]], names=["x", "y"]) + df.groupby(["col1", "x"]) + Grouping DataFrame with Index levels and columns ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ A DataFrame may be grouped by a combination of columns and index levels by From f5c0238fbe07e90df605db6d7fbd63579918a8c6 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 18:57:51 -0400 Subject: [PATCH 16/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index ebd0bd5cf6dbb..312f6b6ffcc4d 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -343,7 +343,8 @@ The argument validation should be done in ``.groupby()``, using the name of the df = pd.DataFrame({"col1": ["a", "b", "c"]}) df.index = pd.MultiIndex.from_arrays([["a", "a", "b"], - [1, 2, 1]], names=["x", "y"]) + [1, 2, 1]], + names=["x", "y"]) df.groupby(["col1", "x"]) Grouping DataFrame with Index levels and columns From 84c11368a00fa48e5a7f60740249f21e681dfbc4 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 19:01:44 -0400 Subject: [PATCH 17/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 312f6b6ffcc4d..482925bd46881 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -274,6 +274,15 @@ the length of the ``groups`` dict, so it is largely just a convenience: df gb = df.groupby("gender") +.. ipython:: python + + @verbatim + In [1]: gb.TAB # noqa: E225, E999 + gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform + gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var + gb.apply gb.cummax gb.cumsum gb.fillna gb.gender gb.head gb.indices gb.mean gb.name gb.ohlc gb.quantile gb.size gb.tail gb.weight + + .. _groupby.multiindex: GroupBy with MultiIndex From ffec05c42d699d45a9ac50c75bd73364020e83fe Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Wed, 13 Jul 2022 21:17:56 -0400 Subject: [PATCH 18/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 482925bd46881..2cfc66e221254 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -277,6 +277,7 @@ the length of the ``groups`` dict, so it is largely just a convenience: .. ipython:: python @verbatim + :okexcept: In [1]: gb.TAB # noqa: E225, E999 gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var From 7d1ebdaee72aa22b1eb7ab4edaf13319f06d33c8 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Thu, 14 Jul 2022 13:18:54 -0400 Subject: [PATCH 19/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 2cfc66e221254..04fbf506c553c 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -278,7 +278,7 @@ the length of the ``groups`` dict, so it is largely just a convenience: @verbatim :okexcept: - In [1]: gb.TAB # noqa: E225, E999 + In [1]: gb.TAB # noqa: E225, E999 gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var gb.apply gb.cummax gb.cumsum gb.fillna gb.gender gb.head gb.indices gb.mean gb.name gb.ohlc gb.quantile gb.size gb.tail gb.weight From f4c1944679d95a08424179bced83be64645308bd Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Thu, 14 Jul 2022 14:20:45 -0400 Subject: [PATCH 20/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 04fbf506c553c..033e098c41fee 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -278,7 +278,7 @@ the length of the ``groups`` dict, so it is largely just a convenience: @verbatim :okexcept: - In [1]: gb.TAB # noqa: E225, E999 + In [1]: gb.TAB gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var gb.apply gb.cummax gb.cumsum gb.fillna gb.gender gb.head gb.indices gb.mean gb.name gb.ohlc gb.quantile gb.size gb.tail gb.weight From 5e1e142ba0a6856ea282cb2133548fc3e055a205 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Thu, 14 Jul 2022 14:27:25 -0400 Subject: [PATCH 21/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 033e098c41fee..706db280bf25e 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -1,5 +1,5 @@ .. _groupby: - +# flake8: noqa {{ header }} ***************************** @@ -278,7 +278,7 @@ the length of the ``groups`` dict, so it is largely just a convenience: @verbatim :okexcept: - In [1]: gb.TAB + In [1]: gb. # noqa: E225, E999 gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var gb.apply gb.cummax gb.cumsum gb.fillna gb.gender gb.head gb.indices gb.mean gb.name gb.ohlc gb.quantile gb.size gb.tail gb.weight From 5119a167e29bcf4fc5cbd8b2b1fad9b6b1d04d45 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Thu, 14 Jul 2022 14:28:37 -0400 Subject: [PATCH 22/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 706db280bf25e..464b6ab5dd233 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -1,5 +1,5 @@ .. _groupby: -# flake8: noqa + {{ header }} ***************************** @@ -277,8 +277,9 @@ the length of the ``groups`` dict, so it is largely just a convenience: .. ipython:: python @verbatim + # flake8: noqa :okexcept: - In [1]: gb. # noqa: E225, E999 + In [1]: gb. gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var gb.apply gb.cummax gb.cumsum gb.fillna gb.gender gb.head gb.indices gb.mean gb.name gb.ohlc gb.quantile gb.size gb.tail gb.weight From 02d6e9080645216479d5fdec5ea980acfbc0dac0 Mon Sep 17 00:00:00 2001 From: Anthony Givans Date: Thu, 14 Jul 2022 21:29:04 -0400 Subject: [PATCH 23/23] updated the docstring in accordance with GH40378 --- doc/source/user_guide/groupby.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/user_guide/groupby.rst b/doc/source/user_guide/groupby.rst index 464b6ab5dd233..3a6ec0bfd6c5c 100644 --- a/doc/source/user_guide/groupby.rst +++ b/doc/source/user_guide/groupby.rst @@ -278,7 +278,6 @@ the length of the ``groups`` dict, so it is largely just a convenience: @verbatim # flake8: noqa - :okexcept: In [1]: gb. gb.agg gb.boxplot gb.cummin gb.describe gb.filter gb.get_group gb.height gb.last gb.median gb.ngroups gb.plot gb.rank gb.std gb.transform gb.aggregate gb.count gb.cumprod gb.dtype gb.first gb.groups gb.hist gb.max gb.min gb.nth gb.prod gb.resample gb.sum gb.var