Skip to content

TST: Fix setitem parametrizations #56890

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
wants to merge 11 commits into from
Closed

TST: Fix setitem parametrizations #56890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9b9ab11
Fix setitem parametrizations and raise correct Valueerror when pd.NA …
lopof Jan 15, 2024
94b50a5
Merge branch 'main' into 56727-parametrization
lopof Jan 22, 2024
0b9f7f0
fix mypy incompatible type
lopof Jan 22, 2024
62f8862
Merge branch 'main' into 56727-parametrization
lopof Jan 22, 2024
939af20
Merge branch 'main' into 56727-parametrization
lopof Jan 27, 2024
dca2229
Merge branch 'main' into 56727-parametrization
lopof Feb 5, 2024
d0e879e
Merge branch 'main' into 56727-parametrization
lopof Feb 9, 2024
6096f2e
Merge branch 'main' into 56727-parametrization
lopof Feb 12, 2024
543416c
Merge branch 'main' into 56727-parametrization
lopof Feb 14, 2024
e3fcc3e
Merge branch 'main' into 56727-parametrization
lopof Feb 26, 2024
c393f10
Merge branch 'main' into 56727-parametrization
lopof Mar 4, 2024
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
7 changes: 6 additions & 1 deletion pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@
ensure_wrapped_if_datetimelike,
extract_array,
)
from pandas.core.indexers import check_setitem_lengths
from pandas.core.indexers import (
check_array_indexer,
check_setitem_lengths,
)
from pandas.core.indexes.base import get_values_for_csv

if TYPE_CHECKING:
Expand Down Expand Up @@ -1661,6 +1664,8 @@ def setitem(self, indexer, value):
# TODO(GH#45419): string[pyarrow] tests break if we transpose
# unconditionally
values = values.T

check_array_indexer(values, indexer)
Copy link
Member

Choose a reason for hiding this comment

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

cc @jbrockmendel

check_setitem_lengths(indexer, value, values)

try:
Expand Down
12 changes: 6 additions & 6 deletions pandas/tests/extension/base/setitem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,9 @@ def test_setitem_integer_array(self, data, idx, box_in_series):
"idx, box_in_series",
[
([0, 1, 2, pd.NA], False),
pytest.param(
[0, 1, 2, pd.NA], True, marks=pytest.mark.xfail(reason="GH-31948")
),
([0, 1, 2, pd.NA], True),
(pd.array([0, 1, 2, pd.NA], dtype="Int64"), False),
# TODO: change False to True?
(pd.array([0, 1, 2, pd.NA], dtype="Int64"), False), # noqa: PT014
(pd.array([0, 1, 2, pd.NA], dtype="Int64"), True),
],
ids=["list-False", "list-True", "integer-array-False", "integer-array-True"],
)
Expand All @@ -225,7 +222,10 @@ def test_setitem_integer_with_missing_raises(self, data, idx, box_in_series):

msg = "Cannot index with an integer indexer containing NA values"
with pytest.raises(ValueError, match=msg):
arr[idx] = arr[0]
if type(arr) is pd.Series:
arr.iloc[idx] = arr.iloc[0]
else:
arr[idx] = arr[0]

@pytest.mark.parametrize("as_callable", [True, False])
@pytest.mark.parametrize("setter", ["loc", None])
Expand Down
17 changes: 13 additions & 4 deletions pandas/tests/extension/json/test_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,24 @@ def test_setitem_integer_array(self, data, idx, box_in_series, request):
request.applymarker(mark)
super().test_setitem_integer_array(data, idx, box_in_series)

@pytest.mark.xfail(reason="list indices must be integers or slices, not NAType")
@pytest.mark.parametrize(
"idx, box_in_series",
[
([0, 1, 2, pd.NA], False),
pytest.param(
[0, 1, 2, pd.NA], True, marks=pytest.mark.xfail(reason="GH-31948")
[0, 1, 2, pd.NA],
False,
marks=pytest.mark.xfail(
reason="Cannot index with an integer indexer containing NA values"
),
),
([0, 1, 2, pd.NA], True),
pytest.param(
pd.array([0, 1, 2, pd.NA], dtype="Int64"),
False,
marks=pytest.mark.xfail(
reason="Cannot index with an integer indexer containing NA values"
),
),
(pd.array([0, 1, 2, pd.NA], dtype="Int64"), False),
(pd.array([0, 1, 2, pd.NA], dtype="Int64"), True),
],
ids=["list-False", "list-True", "integer-array-False", "integer-array-True"],
Expand Down