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.

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

BUG: merging an Integer EA rasises #23262

Merged
merged 15 commits into from
Dec 19, 2018
Merged

BUG: merging an Integer EA rasises #23262

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1e0539d
fix bug #GH23020
makbigc Oct 21, 2018
9310361
change after review
makbigc Nov 4, 2018
cb2d4d1
2nd change after review
makbigc Nov 11, 2018
42477c3
3rd change after review
makbigc Nov 17, 2018
6a9e360
Separate the test and add more cases
makbigc Nov 18, 2018
373582e
add more types into the test_merge_on_int_array
makbigc Dec 5, 2018
f817cad
isort pandas/core/reshape/merge.py
makbigc Dec 9, 2018
8140ee1
Add _values_for_factorize in period.py
makbigc Dec 15, 2018
c425b24
Remove is_period_dtype check
makbigc Dec 15, 2018
29e820d
Modify _values_for_factorize in sparse.py
makbigc Dec 15, 2018
19621e6
Test merge with EA as key and open a special case
makbigc Dec 15, 2018
a69f7b7
Add factorize method in period.py
makbigc Dec 16, 2018
529f88d
Merge remote-tracking branch 'upstream/master' into makbigc-bug-fix-2…
TomAugspurger Dec 18, 2018
61f5e15
Updates
TomAugspurger Dec 18, 2018
6bae6ca
Reorganize the if / elifs
TomAugspurger Dec 18, 2018
File filter

Filter by extension

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
Separate the test and add more cases
  • Loading branch information
@makbigc
makbigc committed Dec 16, 2018
commit 6a9e36013c85c4ae69ea6ef8d1529162ad510c97
7 changes: 4 additions & 3 deletions pandas/tests/extension/base/reshaping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,15 @@ def test_merge(self, data, na_value):
dtype=data.dtype)})
self.assert_frame_equal(res, exp[['ext', 'int1', 'key', 'int2']])

@pytest.mark.parametrize("dtypes", ["Int64"])
def test_merge_on_int_array(self, data, dtypes):
# GH 23020
TomAugspurger marked this conversation as resolved.
Show resolved Hide resolved
df1 = pd.DataFrame({'ext': data[:3],
'key': pd.Series([1, 2, np.nan], dtype='Int64')})

'key': pd.Series([1, 2, np.nan], dtype=dtypes)})
res = pd.merge(df1, df1, on='key')

exp = pd.DataFrame(
{'key': pd.Series([1, 2, np.nan], dtype='Int64'),
{'key': pd.Series([1, 2, np.nan], dtype=dtypes),
'ext_x': data._from_sequence(data[:3], dtype=data.dtype),
'ext_y': data._from_sequence(data[:3], dtype=data.dtype)})

Expand Down