Skip to content

ARROW-7857: [Python] Revert temporary changes to pandas extension array tests #6664

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-7857: [Python] Revert temporary changes to pandas extension array tests #6664

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
21 changes: 8 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 @@ -3634,14 +3634,11 @@ def test_conversion_extensiontype_to_extensionarray(monkeypatch):
arr = pa.ExtensionArray.from_storage(MyCustomIntegerType(), storage)
table = pa.table({'a': arr})

# TODO TEMP use our monkeypatched method for all pandas versions because
# latest pandas release / master fails to cast extension type to int64
# type (see ARROW-7857)
# if LooseVersion(pd.__version__) < "0.26.0.dev":
# ensure pandas Int64Dtype has the protocol method (for older pandas)
monkeypatch.setattr(
pd.Int64Dtype, '__from_arrow__', _Int64Dtype__from_arrow__,
raising=False)
if LooseVersion(pd.__version__) < "0.26.0.dev":
# ensure pandas Int64Dtype has the protocol method (for older pandas)
monkeypatch.setattr(
pd.Int64Dtype, '__from_arrow__', _Int64Dtype__from_arrow__,
raising=False)

# extension type points to Int64Dtype, which knows how to create a
# pandas ExtensionArray
Expand All @@ -3652,11 +3649,9 @@ def test_conversion_extensiontype_to_extensionarray(monkeypatch):

# monkeypatch pandas Int64Dtype to *not* have the protocol method
# (remove the version added above and the actual version for recent pandas)
# TODO TEMP see above
# if LooseVersion(pd.__version__) < "0.26.0.dev":
monkeypatch.delattr(pd.Int64Dtype, "__from_arrow__")
# else:
if LooseVersion(pd.__version__) >= "0.26.0.dev":
if LooseVersion(pd.__version__) < "0.26.0.dev":
monkeypatch.delattr(pd.Int64Dtype, "__from_arrow__")
else:
monkeypatch.delattr(
pd.core.arrays.integer._IntegerDtype, "__from_arrow__",
raising=False)
Expand Down