Skip to content

ENH: Merge DataFrame and Series using on (GH21220) #21223

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

Merged
merged 19 commits into from
Jul 23, 2018
Merged

ENH: Merge DataFrame and Series using on (GH21220) #21223

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
91a3f16
Initial commit
KalyanGokhale May 27, 2018
64e6e66
Removed some now unrequired edits left
KalyanGokhale May 27, 2018
8939fad
Edits to test_join
KalyanGokhale May 28, 2018
b09ffb7
Minor comment edit to force Travis CI rerun
KalyanGokhale May 28, 2018
1a0e5a2
Updated comments in test
KalyanGokhale May 28, 2018
59b487d
Validate operand, parametrized tests, whatnew
KalyanGokhale May 31, 2018
0d14cc2
Moved whatsnew to 0.24.0
KalyanGokhale Jun 7, 2018
12da2ce
Moved whatsnew to 0.24.0
KalyanGokhale Jun 7, 2018
2d689ad
Updated comment in test_join
KalyanGokhale Jun 15, 2018
687568b
Linting, parameterizing test, whatsnew, raising
KalyanGokhale Jun 19, 2018
7ed9688
Updated test_join
KalyanGokhale Jun 19, 2018
2ce56e7
Minor update to whatsnew to force TravisCI rebuild
KalyanGokhale Jun 20, 2018
ac9d5a1
Updating documentation
KalyanGokhale Jun 20, 2018
fdf324c
Resolving conflicts for merging.rst
KalyanGokhale Jun 20, 2018
e896a91
Edits to rst
KalyanGokhale Jun 20, 2018
69d8bda
Whatsnew
KalyanGokhale Jun 20, 2018
f7b333f
Merge branch 'master' into GH21220
KalyanGokhale Jul 19, 2018
c4c988c
Update test_join.py
KalyanGokhale Jul 23, 2018
d099fd6
Force CI tests
KalyanGokhale Jul 23, 2018
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
Prev Previous commit
Next Next commit
Minor comment edit to force Travis CI rerun 
GH21220
  • Loading branch information
@KalyanGokhale
KalyanGokhale committed May 28, 2018
commit b09ffb7d779321102fb2f94d0c046dd70bec1c41
2 changes: 1 addition & 1 deletion pandas/tests/reshape/merge/test_join.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def test_join_on_fails_with_different_column_counts(self):

def test_join_on_fails_with_wrong_object_type(self):
Copy link
Contributor

@jreback jreback Jun 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you parameterize this test
# GH12081
""" GH 21220 - merging of Series and DataFrame is now allowed
""" GH21220 - merging of Series and DataFrame is now allowed
Edited the test to remove the Series object from 'wrongly_typed'
"""
wrongly_typed = [2, 'str', None, np.array([0, 1])]
Expand Down