From 4dea3071f8726e44f03e528d8b8c1088e933a162 Mon Sep 17 00:00:00 2001 From: Antony-evm <60288950+Antony-evm@users.noreply.github.com> Date: Fri, 5 May 2023 14:27:10 +0100 Subject: [PATCH 1/6] added description to join methods of alignment --- pandas/core/generic.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 4eb29428b7dd1..8d12079f25a64 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9450,6 +9450,13 @@ def align( ---------- other : DataFrame or Series join : {{'outer', 'inner', 'left', 'right'}}, default 'outer' + Type of alignment to be performed. + + left: use only keys from left frame, preserve key order. + right: use only keys from right frame, preserve key order. + outer: use union of keys from both frames, sort keys lexicographically. + inner: use intersection of keys from both frames, preserve the order of the left keys. + axis : allowed axis of the other object, default None Align on index (0), columns (1), or both (None). level : int or level name, default None From 3fb882fea27e67513d028607c26993df996464cb Mon Sep 17 00:00:00 2001 From: Antony-evm <60288950+Antony-evm@users.noreply.github.com> Date: Fri, 5 May 2023 14:55:09 +0100 Subject: [PATCH 2/6] Update generic.py --- pandas/core/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 8d12079f25a64..a4e156b1ba105 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9456,7 +9456,7 @@ def align( right: use only keys from right frame, preserve key order. outer: use union of keys from both frames, sort keys lexicographically. inner: use intersection of keys from both frames, preserve the order of the left keys. - + axis : allowed axis of the other object, default None Align on index (0), columns (1), or both (None). level : int or level name, default None From 20788e34c71b9b917e7ba2bb524b49c0d2f9c7af Mon Sep 17 00:00:00 2001 From: Antony-evm <60288950+Antony-evm@users.noreply.github.com> Date: Fri, 5 May 2023 15:14:09 +0100 Subject: [PATCH 3/6] run ruff/black to fix type errors --- pandas/core/generic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index a4e156b1ba105..3cc66c2eb69b0 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9455,7 +9455,8 @@ def align( left: use only keys from left frame, preserve key order. right: use only keys from right frame, preserve key order. outer: use union of keys from both frames, sort keys lexicographically. - inner: use intersection of keys from both frames, preserve the order of the left keys. + inner: use intersection of keys from both frames, + preserve the order of the left keys. axis : allowed axis of the other object, default None Align on index (0), columns (1), or both (None). From a58a638113fedc542b08356e3cb405ffb876d3cb Mon Sep 17 00:00:00 2001 From: Antony Evmorfopoulos <60288950+Antony-evm@users.noreply.github.com> Date: Sun, 7 May 2023 20:15:32 +0100 Subject: [PATCH 4/6] Update pandas/core/generic.py Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> --- pandas/core/generic.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 3cc66c2eb69b0..5d56aa42658d1 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9452,10 +9452,10 @@ def align( join : {{'outer', 'inner', 'left', 'right'}}, default 'outer' Type of alignment to be performed. - left: use only keys from left frame, preserve key order. - right: use only keys from right frame, preserve key order. - outer: use union of keys from both frames, sort keys lexicographically. - inner: use intersection of keys from both frames, + - left: use only keys from left frame, preserve key order. + - right: use only keys from right frame, preserve key order. + - outer: use union of keys from both frames, sort keys lexicographically. + - inner: use intersection of keys from both frames, preserve the order of the left keys. axis : allowed axis of the other object, default None From 88bc3b9bd4982280f4209a09d5d6c43176edb0b8 Mon Sep 17 00:00:00 2001 From: Antony-evm <60288950+Antony-evm@users.noreply.github.com> Date: Mon, 8 May 2023 17:00:26 +0100 Subject: [PATCH 5/6] update from - to * to follow join's doc guide --- pandas/core/generic.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 443452191ebbe..0c59f876510b9 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9473,10 +9473,10 @@ def align( join : {{'outer', 'inner', 'left', 'right'}}, default 'outer' Type of alignment to be performed. - - left: use only keys from left frame, preserve key order. - - right: use only keys from right frame, preserve key order. - - outer: use union of keys from both frames, sort keys lexicographically. - - inner: use intersection of keys from both frames, + * left: use only keys from left frame, preserve key order. + * right: use only keys from right frame, preserve key order. + * outer: use union of keys from both frames, sort keys lexicographically. + * inner: use intersection of keys from both frames, preserve the order of the left keys. axis : allowed axis of the other object, default None From 600a21b16bf4c5c36dce980fd8ae0cd7de36a50b Mon Sep 17 00:00:00 2001 From: Antony-evm <60288950+Antony-evm@users.noreply.github.com> Date: Tue, 9 May 2023 05:10:08 +0100 Subject: [PATCH 6/6] Update generic.py --- pandas/core/generic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 0c59f876510b9..017fb44413c8f 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -9477,7 +9477,7 @@ def align( * right: use only keys from right frame, preserve key order. * outer: use union of keys from both frames, sort keys lexicographically. * inner: use intersection of keys from both frames, - preserve the order of the left keys. + preserve the order of the left keys. axis : allowed axis of the other object, default None Align on index (0), columns (1), or both (None).