Skip to content

Fix numpy 2.1 strings #9536

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 1 commit into from
Closed

Fix numpy 2.1 strings #9536

Show file tree
Hide file tree
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
12 changes: 10 additions & 2 deletions xarray/core/variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,16 @@ def convert_non_numpy_type(data):
else:
data = np.asarray(data)

if not isinstance(data, np.ndarray) and (
hasattr(data, "__array_function__") or hasattr(data, "__array_namespace__")
if (
not isinstance(data, np.ndarray)
and (
hasattr(data, "__array_function__") or hasattr(data, "__array_namespace__")
)
# Not exactly sure why this is a special case but
# https://github.com/pydata/xarray/issues/9535
# (possibly numpy strings can be
# indexed but it's indexing the string rather than as an array?)
and not isinstance(data, np.str_)
Comment on lines +324 to +332
Copy link
Collaborator

@keewis keewis Sep 23, 2024

Choose a reason for hiding this comment

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

as pointed out in #9535 I believe this will be resolved by #9403, but in case it doesn't, can we combine the isinstance checks?

Suggested change
not isinstance(data, np.ndarray)
and (
hasattr(data, "__array_function__") or hasattr(data, "__array_namespace__")
)
# Not exactly sure why this is a special case but
# https://github.com/pydata/xarray/issues/9535
# (possibly numpy strings can be
# indexed but it's indexing the string rather than as an array?)
and not isinstance(data, np.str_)
# Not exactly sure why this is a special case but
# https://github.com/pydata/xarray/issues/9535
# (possibly numpy strings can be
# indexed but it's indexing the string rather than as an array?)
not isinstance(data, np.ndarray | np.str_)
and (
hasattr(data, "__array_function__") or hasattr(data, "__array_namespace__")
)

):
return cast("T_DuckArray", data)

Expand Down
9 changes: 9 additions & 0 deletions xarray/tests/test_variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3068,3 +3068,12 @@ def test_pandas_indexing_adapter_non_nanosecond_conversion(index, dtype) -> None
with pytest.warns(UserWarning, match="non-nanosecond precision"):
var = Variable(["time"], data)
assert var.dtype == np.dtype(f"{dtype}[ns]")


def test_numpy_strings():
# https://github.com/pydata/xarray/issues/9535
data = np.full((5,), fill_value="nothing")
da = DataArray(data)
values = np.asarray(["foo", "bar"])
da[1:2] = values[0]
assert da.sel(dim_0=1).item() == "foo"
Loading