Skip to content

Fix Pydap tests for numpy 2.3.0 changes (scalar string to unicode) #10421

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 3 commits into from
Jun 13, 2025
Merged

Fix Pydap tests for numpy 2.3.0 changes (scalar string to unicode) #10421

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d03278
Fix Pydap test_cmp_local_file for numpy 2.3.0 changes
kmuehlbauer Jun 12, 2025
2404773
Apply suggestions from code review
kmuehlbauer Jun 12, 2025
94ac967
fix another test
kmuehlbauer Jun 12, 2025
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 @@ -24,6 +24,8 @@ Deprecations

Bug fixes
~~~~~~~~~
- Fix Pydap test_cmp_local_file for numpy 2.3.0 changes, 1. do always return arrays for all versions and 2. skip astype(str) for numpy >= 2.3.0 for expected data.
By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.


Documentation
Expand Down
11 changes: 7 additions & 4 deletions xarray/tests/test_backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5417,11 +5417,12 @@ def convert_to_pydap_dataset(self, original):
@contextlib.contextmanager
def create_datasets(self, **kwargs):
with open_example_dataset("bears.nc") as expected:
# print("QQ0:", expected["bears"].load())
pydap_ds = self.convert_to_pydap_dataset(expected)
actual = open_dataset(PydapDataStore(pydap_ds))
# TODO solve this workaround:
# netcdf converts string to byte not unicode
expected["bears"] = expected["bears"].astype(str)
if Version(np.__version__) < Version("2.3.0"):
# netcdf converts string to byte not unicode
expected["bears"] = expected["bears"].astype(str)
yield actual, expected

def test_cmp_local_file(self) -> None:
Expand All @@ -5441,7 +5442,9 @@ def test_cmp_local_file(self) -> None:
assert_equal(actual[{"l": 2}], expected[{"l": 2}])

with self.create_datasets() as (actual, expected):
assert_equal(actual.isel(i=0, j=-1), expected.isel(i=0, j=-1))
# always return arrays and not scalars
# scalars will be promoted to unicode for numpy >= 2.3.0
assert_equal(actual.isel(i=[0], j=[-1]), expected.isel(i=[0], j=[-1]))

with self.create_datasets() as (actual, expected):
assert_equal(actual.isel(j=slice(1, 2)), expected.isel(j=slice(1, 2)))
Expand Down
Loading