Skip to content

Make merge dispatchable on pandas/other dataframe types#4522

Merged
mrocklin merged 8 commits intodask:masterfrom
mrocklin:merge-dispatch
Feb 26, 2019
Merged

Make merge dispatchable on pandas/other dataframe types#4522
mrocklin merged 8 commits intodask:masterfrom
mrocklin:merge-dispatch

Conversation

@mrocklin
Copy link
Copy Markdown
Member

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 pull request 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
Copy Markdown
Member Author

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
Copy Markdown
Member Author

@jcrist are you comfortable with these changes?

@jcrist
Copy link
Copy Markdown
Member

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
@mrocklin mrocklin deleted the merge-dispatch branch February 26, 2019 20:14
jorge-pessoa pushed a commit to jorge-pessoa/dask that referenced this pull request May 14, 2019
kkraus14 pushed a commit to rapidsai/dask-cudf that referenced this pull request 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

Development

Successfully merging this pull request may close these issues.

2 participants