Skip to content

Change np.core.defchararray to np.char (#9165) #9166

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 8 commits into from
Jun 26, 2024
Merged

Change np.core.defchararray to np.char (#9165) #9166

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a5158e8
Change np.core.defchararray to np.char.chararray (#9165)
pont-us Jun 24, 2024
5f63d95
Add test for assert_allclose on dtype S (#9165)
pont-us Jun 25, 2024
08dcff2
Use np.char.decode, not np.char.chararray.decode
pont-us Jun 25, 2024
dbe95c4
List #9165 fix in whats-new.rst
pont-us Jun 25, 2024
37d698d
Merge branch 'main' into chararray_import
pont-us Jun 25, 2024
4086acf
cross-like the fixed function
keewis Jun 25, 2024
cb77fab
Improve a parameter ID in tests.test_assertions
pont-us Jun 25, 2024
11f7c74
whats-new normalization
keewis Jun 26, 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
2 changes: 2 additions & 0 deletions doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Deprecations

Bug fixes
~~~~~~~~~
- Make `testing.assert_allclose` work with numpy 2.0 (:issue:`9165`, :pull:`9166`).
By `Pontus Lurcock <https://github.com/pont-us>`_


Documentation
Expand Down
2 changes: 1 addition & 1 deletion xarray/testing/assertions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def wrapper(*args, **kwargs):

def _decode_string_data(data):
if data.dtype.kind == "S":
return np.core.defchararray.decode(data, "utf-8", "replace")
return np.char.decode(data, "utf-8", "replace")
return data


Expand Down
5 changes: 5 additions & 0 deletions xarray/tests/test_assertions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ def test_allclose_regression() -> None:
xr.Dataset({"a": ("x", [0, 2]), "b": ("y", [0, 1])}),
id="Dataset",
),
pytest.param(
xr.DataArray(np.array("a", dtype="|S1")),
xr.DataArray(np.array("b", dtype="|S1")),
id="DataArray_dtypeS",
),
),
)
def test_assert_allclose(obj1, obj2) -> None:
Expand Down