Skip to content
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

adapt to NEP 51 #8064

Merged
merged 6 commits into from
Sep 25, 2023
Merged

adapt to NEP 51 #8064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5d2e84
convert string and bytes items to standard python types
keewis Aug 10, 2023
dc41da4
[test-upstream]
keewis Aug 10, 2023
f3ccc5b
Merge branch 'main' into scalar-repr
keewis Sep 15, 2023
f720c62
Merge branch 'main' into scalar-repr
keewis Sep 17, 2023
44ddeda
modify the expected error message
keewis Sep 20, 2023
1dfe3c5
Merge branch 'main' into scalar-repr
keewis Sep 20, 2023
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
2 changes: 2 additions & 0 deletions xarray/core/formatting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ def format_item(x, timedelta_format=None, quote_strings=True):
if isinstance(x, (np.timedelta64, timedelta)):
return format_timedelta(x, timedelta_format=timedelta_format)
elif isinstance(x, (str, bytes)):
if hasattr(x, "dtype"):
x = x.item()
return repr(x) if quote_strings else x
elif hasattr(x, "dtype") and np.issubdtype(x.dtype, np.floating):
return f"{x.item():.4}"
Expand Down
3 changes: 2 additions & 1 deletion xarray/tests/test_dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4116,7 +4116,8 @@ def test_setitem(self) -> None:
data4[{"dim2": [2, 3]}] = data3["var1"][{"dim2": [3, 4]}].values
data5 = data4.astype(str)
data5["var4"] = data4["var1"]
err_msg = "could not convert string to float: 'a'"
# convert to `np.str_('a')` once `numpy<2.0` has been dropped
err_msg = "could not convert string to float: .*'a'.*"
with pytest.raises(ValueError, match=err_msg):
data5[{"dim2": 1}] = "a"

Expand Down
Loading