Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate method parameters to DataFrame.join, DataFrame.merge. #9291

Merged
merged 7 commits into from
Oct 1, 2021
Merged

Deprecate method parameters to DataFrame.join, DataFrame.merge. #9291

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
db1d73a
Add docstring for join method.
bdice Sep 23, 2021
aa44b48
Mark parameter as unused.
bdice Sep 24, 2021
928cbda
Remove internal uses of method, leaving only the unused parameter in …
bdice Sep 24, 2021
e803721
Remove unused method parameter.
bdice Sep 28, 2021
e8b12ed
Update tests to skip unused method argument.
bdice Sep 28, 2021
79bbfd4
Use set.
bdice Sep 29, 2021
4c060c0
Deprecate the method argument.
bdice Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions python/cudf/cudf/core/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4458,7 +4458,7 @@ def merge(
sort=False,
lsuffix=None,
rsuffix=None,
method="hash",
method=None,
indicator=False,
suffixes=("_x", "_y"),
):
Expand Down Expand Up @@ -4503,8 +4503,8 @@ def merge(
suffixes: Tuple[str, str], defaults to ('_x', '_y')
Suffixes applied to overlapping column names on the left and right
sides
method : {‘hash’, ‘sort’}, default ‘hash’
The implementation method to be used for the operation.
method :
This parameter is unused.

Returns
-------
Expand Down Expand Up @@ -4576,7 +4576,6 @@ def merge(
right_index=right_index,
how=how,
sort=sort,
method=method,
indicator=indicator,
suffixes=suffixes,
)
Expand All @@ -4591,7 +4590,7 @@ def join(
lsuffix="",
rsuffix="",
sort=False,
method="hash",
method=None,
):
"""Join columns with other DataFrame on index or on a key column.

Expand All @@ -4605,6 +4604,8 @@ def join(
column names when avoiding conflicts.
sort : bool
Set to True to ensure sorted ordering.
method :
This parameter is unused.
bdice marked this conversation as resolved.
Show resolved Hide resolved

Returns
-------
Expand Down
2 changes: 0 additions & 2 deletions python/cudf/cudf/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3065,7 +3065,6 @@ def _merge(
right_index=False,
how="inner",
sort=False,
method="hash",
indicator=False,
suffixes=("_x", "_y"),
):
Expand All @@ -3088,7 +3087,6 @@ def _merge(
right_index=right_index,
how=how,
sort=sort,
method=method,
indicator=indicator,
suffixes=suffixes,
)
Expand Down
3 changes: 0 additions & 3 deletions python/cudf/cudf/core/join/join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def merge(
right_index,
how,
sort,
method,
indicator,
suffixes,
):
Expand All @@ -47,7 +46,6 @@ def merge(
right_index=right_index,
how=how,
sort=sort,
method=method,
indicator=indicator,
suffixes=suffixes,
)
Expand Down Expand Up @@ -87,7 +85,6 @@ def __init__(
right_index,
how,
sort,
method,
indicator,
suffixes,
):
Expand Down
1 change: 0 additions & 1 deletion python/cudf/cudf/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4907,7 +4907,6 @@ def merge(
right_index=right_index,
how=how,
sort=sort,
method=method,
indicator=False,
suffixes=suffixes,
)
Expand Down