Skip to content

ENH: [Draft] Fix issue #35131 Identify zero-dimensional duck arrays as non-iterable #44626

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 20 commits into from
Dec 20, 2021
Merged

ENH: [Draft] Fix issue #35131 Identify zero-dimensional duck arrays as non-iterable #44626

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3b8ebf0
Add failing test
znicholls Feb 13, 2021
764a44e
Add __array__ method to mock numpy-like
znicholls Feb 13, 2021
dabcf62
TST: GH35131 Add failing test of numpy-like array handling
znicholls Jul 5, 2020
c0ce501
ENH: GH35131 Implement fix which allows numpy-like handling
znicholls Jul 5, 2020
4ffe216
Simplify ndim check
znicholls Jul 5, 2020
d340a80
Revert change because it broke tests
znicholls Jul 6, 2020
ad86e5d
Use slightly clearer logic
znicholls Jul 6, 2020
9a2eb94
Update to use numpy iterable
znicholls Jul 7, 2020
465dd37
Add failing is_scalar tests
znicholls Jul 7, 2020
b83109e
Revert to relying on python's shortcircuit operators
znicholls Jul 7, 2020
2e08233
Make a mess
znicholls Feb 13, 2021
8941c28
Fix missing module
znicholls Feb 13, 2021
2c58795
rebased to current master; reverted changes to assert_almost_equal
burnpanck Nov 26, 2021
e7bcee0
fix tests and clarify that a 0-dimensional duck-array is *NOT* a scal…
burnpanck Nov 26, 2021
c4c348b
performance short-cuts for np.ndarray and list
burnpanck Nov 26, 2021
b285293
changes requested during review by @jbrockmendel
burnpanck Nov 27, 2021
41af909
Merge remote-tracking branch 'upstream/master' into bugfix/fix-35131-…
burnpanck Dec 18, 2021
99af0bd
change requested in review by jreback
burnpanck Dec 18, 2021
8fff190
made code comments a little bit more explicit
burnpanck Dec 18, 2021
00ce2e0
Merge branch 'master' into bugfix/fix-35131-zero-dim-duck-arrays
jreback Dec 19, 2021
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
Add __array__ method to mock numpy-like
  • Loading branch information
@znicholls @burnpanck
znicholls authored and burnpanck committed Nov 26, 2021
commit 764a44edacb6af01900a9c42955488ee4718a326
17 changes: 11 additions & 6 deletions pandas/tests/dtypes/test_inference.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,16 @@ def __iter__(self):
iter_values = iter(self._values)

def it_outer():
for element in iter_values:
yield element
yield from iter_values

return it_outer()

def __len__(self):
return len(self._values)

def __array__(self, t=None):
return self._values

@property
def ndim(self):
return self._values.ndim
Expand Down Expand Up @@ -237,10 +239,13 @@ class DtypeList(list):
assert not inference.is_array_like(123)


@pytest.mark.parametrize("eg", (
np.array(2),
MockNumpyLikeArray(np.array(2)),
))
@pytest.mark.parametrize(
"eg",
(
np.array(2),
MockNumpyLikeArray(np.array(2)),
),
)
def test_assert_almost_equal(eg):
tm.assert_almost_equal(eg, eg)

Expand Down