Skip to content

Fixing shift() for ExtensionArray #23947

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 12 commits into from
Dec 9, 2018
Merged

Fixing shift() for ExtensionArray #23947

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7ff05e7
Fixing shift() for ExtensionArray #23911
varadgunjal Nov 27, 2018
532436e
Edited the docstring of shift() to reflect changes.
varadgunjal Nov 27, 2018
6584dca
Adding whatsnew entry for 0.24.0
varadgunjal Nov 27, 2018
abba682
Fixing SparseArray.shift()
varadgunjal Nov 27, 2018
172545a
PEP8 fix
varadgunjal Nov 27, 2018
67c268d
Adding a skip for shift for because the implementation is buggy
varadgunjal Dec 1, 2018
b0c13e4
Adding in changes requested by @TomAugspurger
varadgunjal Dec 1, 2018
acecc2a
Bugfix: changing len to len(self)
varadgunjal Dec 1, 2018
e5b7ebc
Adding tests for empty array
varadgunjal Dec 2, 2018
eb4eea9
Adding relevant skips for ArrowBoolArray
varadgunjal Dec 2, 2018
d659404
Changes requested by @jreback
varadgunjal Dec 5, 2018
31a9cc8
PEP8 fix
varadgunjal Dec 8, 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
8 changes: 5 additions & 3 deletions pandas/core/arrays/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,12 @@ def shift(self, periods=1):
"""
# Note: this implementation assumes that `self.dtype.na_value` can be
# stored in an instance of your ExtensionArray with `self.dtype`.
if periods == 0:
if len == 0 or periods == 0:
return self.copy()
empty = self._from_sequence([self.dtype.na_value] * abs(periods),
dtype=self.dtype)
empty = self._from_sequence(
[self.dtype.na_value] * min(abs(periods), len(self)),
dtype=self.dtype
)
if periods > 0:
a = empty
b = self[:-periods]
Expand Down
14 changes: 14 additions & 0 deletions pandas/tests/extension/base/interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import numpy as np
import pytest

from pandas.compat import StringIO

Expand Down Expand Up @@ -86,3 +87,16 @@ def test_isna_extension_array(self, data_missing):
assert not na.all()

assert na.dtype._is_boolean

@pytest.mark.parametrize('periods, indices', [
Copy link
Contributor

Choose a reason for hiding this comment

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

I would move this to methods.py I think (and obviously move the overrides in arrow as well)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Since moving this to methods takes it out of the BaseInterfaceTests class, I can discard the overrides in arrow, since, currently, there is no test class within it deriving from BaseMethodsTests (or BaseExtensionTests for that matter). Is that acceptable?

Copy link
Contributor

Choose a reason for hiding this comment

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

see my comment below

[-4, [-1, -1]],
[-1, [1, -1]],
[0, [0, 1]],
[1, [-1, 0]],
[4, [-1, -1]]
])
def test_shift(self, data, periods, indices):
subset = data[:2]
result = subset.shift(periods)
expected = subset.take(indices, allow_fill=True)
self.assert_extension_array_equal(result, expected)