From 5327fe8a94f4358ed799cb3e87257ce80ff5f272 Mon Sep 17 00:00:00 2001 From: mehgarg Date: Mon, 25 Jul 2022 19:01:53 -0700 Subject: [PATCH 1/6] moving edits to pivot_table --- pandas/core/frame.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index ead4ea744c647..49522eed3edcb 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8564,7 +8564,8 @@ def pivot(self, index=None, columns=None, values=None) -> DataFrame: margins : bool, default False Add all row / columns (e.g. for subtotal / grand totals). dropna : bool, default True - Do not include columns whose entries are all NaN. + Do not include columns whose entries are all NaN. If true: + exclude rows containing missing data from aggregated margins margins_name : str, default 'All' Name of the row / column that will contain the totals when margins is True. From 445c7ed4d2dd876d09908138a2dfe36b51e6943e Mon Sep 17 00:00:00 2001 From: mehgarg Date: Mon, 25 Jul 2022 21:11:19 -0700 Subject: [PATCH 2/6] missing punctuation' --- pandas/core/frame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 49522eed3edcb..098a1436668f1 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8565,7 +8565,7 @@ def pivot(self, index=None, columns=None, values=None) -> DataFrame: Add all row / columns (e.g. for subtotal / grand totals). dropna : bool, default True Do not include columns whose entries are all NaN. If true: - exclude rows containing missing data from aggregated margins + exclude rows containing missing data from aggregated margins. margins_name : str, default 'All' Name of the row / column that will contain the totals when margins is True. From 2c65631753af70c01ed9db1d661dca26e5c7bbb3 Mon Sep 17 00:00:00 2001 From: mehgarg Date: Wed, 27 Jul 2022 21:27:38 -0700 Subject: [PATCH 3/6] trailing whitespace --- pandas/core/frame.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 098a1436668f1..60cae27319a61 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8564,7 +8564,7 @@ def pivot(self, index=None, columns=None, values=None) -> DataFrame: margins : bool, default False Add all row / columns (e.g. for subtotal / grand totals). dropna : bool, default True - Do not include columns whose entries are all NaN. If true: + Do not include columns whose entries are all NaN. If true: exclude rows containing missing data from aggregated margins. margins_name : str, default 'All' Name of the row / column that will contain the totals @@ -10047,6 +10047,7 @@ def merge( copy: bool = True, indicator: bool = False, validate: str | None = None, + ) -> DataFrame: from pandas.core.reshape.merge import merge From 43ec8e47d6512ec2c9f25fde9203188cbf1a9b03 Mon Sep 17 00:00:00 2001 From: mehgarg Date: Thu, 28 Jul 2022 15:54:37 -0700 Subject: [PATCH 4/6] clarifying documentation --- pandas/core/frame.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 60cae27319a61..4074c8ef28f62 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8565,7 +8565,8 @@ def pivot(self, index=None, columns=None, values=None) -> DataFrame: Add all row / columns (e.g. for subtotal / grand totals). dropna : bool, default True Do not include columns whose entries are all NaN. If true: - exclude rows containing missing data from aggregated margins. + rows with a NaN value in any column will be omitted before + computing margins. margins_name : str, default 'All' Name of the row / column that will contain the totals when margins is True. @@ -10046,8 +10047,7 @@ def merge( suffixes: Suffixes = ("_x", "_y"), copy: bool = True, indicator: bool = False, - validate: str | None = None, - + validate: str | None = None, ) -> DataFrame: from pandas.core.reshape.merge import merge From 8eea774d04614ae8a6040ee32b7f5733d75e800e Mon Sep 17 00:00:00 2001 From: mehgarg Date: Thu, 28 Jul 2022 20:58:41 -0700 Subject: [PATCH 5/6] formatting --- pandas/core/frame.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 4074c8ef28f62..3cb51f73dcac0 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -8564,8 +8564,8 @@ def pivot(self, index=None, columns=None, values=None) -> DataFrame: margins : bool, default False Add all row / columns (e.g. for subtotal / grand totals). dropna : bool, default True - Do not include columns whose entries are all NaN. If true: - rows with a NaN value in any column will be omitted before + Do not include columns whose entries are all NaN. If True, + rows with a NaN value in any column will be omitted before computing margins. margins_name : str, default 'All' Name of the row / column that will contain the totals From 88a98e5fb7b60bbc677afb91df9c19fbbf2b39fa Mon Sep 17 00:00:00 2001 From: mehgarg Date: Fri, 29 Jul 2022 07:52:57 -0700 Subject: [PATCH 6/6] reverting line --- pandas/core/frame.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 3cb51f73dcac0..39bbfc75b0376 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -10047,7 +10047,7 @@ def merge( suffixes: Suffixes = ("_x", "_y"), copy: bool = True, indicator: bool = False, - validate: str | None = None, + validate: str | None = None, ) -> DataFrame: from pandas.core.reshape.merge import merge