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

Projects
None yet
2 participants
@mrocklin
Copy link
Member

commented Feb 22, 2019

See discussion in #4521

  • Tests added / passed
  • Passes flake8 dask

@mrocklin mrocklin referenced this pull request Feb 22, 2019

Closed

Merge dispatch #4521

mrocklin added a commit to mrocklin/dask-cudf that referenced this pull request Feb 22, 2019

Add tests for single-dataframe merge
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

This comment has been minimized.

Copy link
Member Author

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

This comment has been minimized.

Copy link
Member Author

commented Feb 22, 2019

@jcrist are you comfortable with these changes?

@jcrist

This comment has been minimized.

Copy link
Member

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

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@mrocklin mrocklin deleted the mrocklin:merge-dispatch branch Feb 26, 2019

jorge-pessoa pushed a commit to jorge-pessoa/dask that referenced this pull request May 14, 2019

kkraus14 added a commit to rapidsai/dask-cudf that referenced this pull request May 14, 2019

Add tests for single-dataframe merge (#101)
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
You can’t perform that action at this time.