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.

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

Make merge dispatchable on pandas/other dataframe types #4522

Merged
merged 8 commits into from Feb 26, 2019

Conversation

@mrocklin
Copy link
Member

@mrocklin mrocklin commented Feb 22, 2019

See discussion in #4521

  • Tests added / passed
  • Passes flake8 dask
@mrocklin mrocklin mentioned this pull request Feb 22, 2019
mrocklin added a commit to mrocklin/dask-cudf that referenced this issue Feb 22, 2019
This relies on some changes upstream, notably ...

-   dask/dask#4522
-   rapidsai/cudf#1031

    for which I have a hacky solution here:

    rapidsai/cudf@branch-0.6...mrocklin:merge-keywords-hack
@mrocklin
Copy link
Member Author

@mrocklin mrocklin commented Feb 22, 2019

I've also removed a fair bit of special-cased code that was, I suspect, necessary for older versions of Pandas but is no longer needed.

@mrocklin mrocklin changed the title [WIP] Make merge dispatchable on pandas/other dataframe types Make merge dispatchable on pandas/other dataframe types Feb 22, 2019
@mrocklin
Copy link
Member Author

@mrocklin mrocklin commented Feb 22, 2019

@jcrist are you comfortable with these changes?

@jcrist
Copy link
Member

@jcrist jcrist commented Feb 22, 2019

Fine by me, nice to see that this could be done easily without adding an additional dependency.

@mrocklin mrocklin merged commit 7b4b540 into dask:master Feb 26, 2019
2 checks passed
@mrocklin mrocklin deleted the merge-dispatch branch Feb 26, 2019
jorge-pessoa pushed a commit to jorge-pessoa/dask that referenced this issue May 14, 2019
kkraus14 pushed a commit to rapidsai/dask-cudf that referenced this issue May 14, 2019
This relies on some changes upstream, notably ...

-   dask/dask#4522
-   rapidsai/cudf#1031

    for which I have a hacky solution here:

    rapidsai/cudf@branch-0.6...mrocklin:merge-keywords-hack
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants