From b19b915609d459adb4c9dea240a0976abd613268 Mon Sep 17 00:00:00 2001 From: phofl Date: Thu, 19 Nov 2020 00:02:27 +0100 Subject: [PATCH 1/3] Update userguide --- doc/source/user_guide/merging.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/source/user_guide/merging.rst b/doc/source/user_guide/merging.rst index f1a28dc30dd68..4c3c65b17f7f0 100644 --- a/doc/source/user_guide/merging.rst +++ b/doc/source/user_guide/merging.rst @@ -194,7 +194,7 @@ behavior: }, index=[2, 3, 6, 7], ) - result = pd.concat([df1, df4], axis=1, sort=False) + result = pd.concat([df1, df4], axis=1) .. ipython:: python @@ -206,10 +206,9 @@ behavior: .. warning:: - The default behavior with ``join='outer'`` is to sort the other axis - (columns in this case). In a future version of pandas, the default will - be to not sort. We specified ``sort=False`` to opt in to the new - behavior now. + .. versionchanged:::::: 1.0.0 + + The default behavior with ``join='outer` changed to not sort. Here is the same thing with ``join='inner'``: From 5402423f61e59d04c979c4dbd6203b5a830a9c59 Mon Sep 17 00:00:00 2001 From: phofl Date: Thu, 19 Nov 2020 00:35:17 +0100 Subject: [PATCH 2/3] Add end string --- doc/source/user_guide/merging.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/user_guide/merging.rst b/doc/source/user_guide/merging.rst index 4c3c65b17f7f0..3927de49d4799 100644 --- a/doc/source/user_guide/merging.rst +++ b/doc/source/user_guide/merging.rst @@ -208,7 +208,7 @@ behavior: .. versionchanged:::::: 1.0.0 - The default behavior with ``join='outer` changed to not sort. + The default behavior with ``join='outer'`` changed to not sort. Here is the same thing with ``join='inner'``: From 60d424a08b19de3ced95bb86e3f33ce349ee23c0 Mon Sep 17 00:00:00 2001 From: phofl Date: Thu, 19 Nov 2020 15:58:30 +0100 Subject: [PATCH 3/3] Remove warning --- doc/source/user_guide/merging.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/source/user_guide/merging.rst b/doc/source/user_guide/merging.rst index 3927de49d4799..d8998a9a0a6e1 100644 --- a/doc/source/user_guide/merging.rst +++ b/doc/source/user_guide/merging.rst @@ -204,12 +204,6 @@ behavior: p.plot([df1, df4], result, labels=["df1", "df4"], vertical=False); plt.close("all"); -.. warning:: - - .. versionchanged:::::: 1.0.0 - - The default behavior with ``join='outer'`` changed to not sort. - Here is the same thing with ``join='inner'``: .. ipython:: python