Skip to content

ARROW-6561: [Python] Fix python tests to pass on pandas master #5384

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

Closed
jorisvandenbossche wants to merge 1 commit into from
Closed

ARROW-6561: [Python] Fix python tests to pass on pandas master #5384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 6 additions & 13 deletions python/pyarrow/tests/test_pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3025,18 +3025,14 @@ def test_array_protocol():
if LooseVersion(pd.__version__) < '0.24.0':
pytest.skip('IntegerArray only introduced in 0.24')

def __arrow_array__(self, type=None):
return pa.array(self._data, mask=self._mask, type=type)

df = pd.DataFrame({'a': pd.Series([1, 2, None], dtype='Int64')})

# with latest pandas/arrow, trying to convert nullable integer errors
with pytest.raises(TypeError):
pa.table(df)

try:
# patch IntegerArray with the protocol
pd.arrays.IntegerArray.__arrow_array__ = __arrow_array__
if LooseVersion(pd.__version__) < '0.26.0.dev':
# with pandas<=0.25, trying to convert nullable integer errors
with pytest.raises(TypeError):
pa.table(df)
else:
# __arrow_array__ added to pandas IntegerArray in 0.26.0.dev

# default conversion
result = pa.table(df)
Expand All @@ -3061,9 +3057,6 @@ def __arrow_array__(self, type=None):
result = pa.array(df['a'].values, type=pa.float64())
assert result.equals(expected2)

finally:
del pd.arrays.IntegerArray.__arrow_array__


# ----------------------------------------------------------------------
# Legacy metadata compatibility tests
Expand Down