-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
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
Support merging DataFrames on a combo of columns and index levels (GH 14355) #17484
Merged
Merged
Changes from all commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
da94fdb
Support merging frames on a combo of columns and index levels (GH 14355)
f8c8c53
Cleanup for review
368844a
revert implementation (but keep documentation and tests)
1c4699e
Simplify and refactor column/level logic in merge
ac1189b
PEP8 cleanup
d90ed78
Extract column/level ambiguity warning logic into utility method
27b2d25
Add newline and add :ref: entry for new doc section
de6f4b1
docstring / comment cleanup
39d0bba
Merge branch 'master' into enh_14355
5b1b100
Documentation updates
dfc6cf7
Fix errors in _drop_columns_or_levels
03e3c2e
Refactor and parametrize test cases
bf5d349
Moved label/level helpers up to NDFrame, added axis support, and adde…
7da39aa
PEP8
f5a16ff
Revert accidental change to merging.rst
aa099ea
Use fixtures for new TestMergeColumnAndIndex tests
3be43a4
Merge branch 'master' into enh_14355
b655e30
Merge branch 'master' into enh_14355
b7e2cc2
Merge branch 'master' into enh_14355
e9f02b1
Update documentation for a 0.22 release
0cd4ef5
Merge remote-tracking branch 'upstream/master' into enh_14355
e029f7b
Documentation updates
fdddbd3
Moved test_label_or_level_utils to pandas/tests/generic
89061b9
Refactored level_or_level test cases to use fixtures
090b3e8
Moved label_or_level utils on Series and DataFrame to NDFrame
47ff8b8
fix test comment typo
59f2dce
PEP8ify
4c4dbd0
Merge remote-tracking branch 'upstream/master' into enh_14355
1d7e570
Moved column and index tests to new file
dd289a6
Remove test class and convert to using fixtures
313d2c3
Rename new test file
0b0397b
Documentation and testing review updates
bc53bef
Merge remote-tracking branch 'upstream/master' into enh_14355
cd17c42
Merge remote-tracking branch 'upstream/master' into enh_14355
1a4e3e4
Merge remote-tracking branch 'upstream/master' into enh_14355
a49012c
Fix generator/list lint issues
6fd9760
Allow non-None hashable objects to reference index levels (not just s…
f7e04f5
Reduce parameterized test case count by removing how fixture
cf8e654
Refactor warning code and add stacklevel
e874f04
Use single backticks to reference method params in docstrings
13ce87c
Add tests and docstring updates for using index levels as `on` param …
b5cb4c1
PEP8
f3b95fe
Fixed Note->Notes in docstring
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
an you add a comment (here and left_on/right_on) that index level merging is new in 0.22.0 (or maybe in a Note section below)