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

On Windows, enable successful test of opening a dataset containing a cftime index #6305

Merged
merged 3 commits into from
Feb 28, 2022
Merged

On Windows, enable successful test of opening a dataset containing a cftime index #6305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82bd7b6
Exit cluster context before deleting temporary directory
stanwest Feb 25, 2022
61c9f2f
Use fixture instead of context manager for temporary directory
stanwest Feb 25, 2022
3337833
Edit whats-new entry
stanwest Feb 25, 2022
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: 1 addition & 1 deletion doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Bug fixes

- Variables which are chunked using dask in larger (but aligned) chunks than the target zarr chunk size
can now be stored using `to_zarr()` (:pull:`6258`) By `Tobias Kölling <https://github.com/d70-t>`_.
- Multi-file datasets containing encoded :py:class:`cftime.datetime` objects can be read in parallel again (:issue:`6226`, :pull:`6249`). By `Martin Bergemann <https://github.com/antarcticrainforest>`_.
- Multi-file datasets containing encoded :py:class:`cftime.datetime` objects can be read in parallel again (:issue:`6226`, :pull:`6249`, :pull:`6305`). By `Martin Bergemann <https://github.com/antarcticrainforest>`_ and `Stan West <https://github.com/stanwest>`_.

Documentation
~~~~~~~~~~~~~
Expand Down
15 changes: 6 additions & 9 deletions xarray/tests/test_distributed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
""" isort:skip_file """
import os
import pickle
import numpy as np
import tempfile

import pytest

Expand Down Expand Up @@ -113,19 +111,18 @@ def test_dask_distributed_netcdf_roundtrip(

@requires_cftime
@requires_netCDF4
def test_open_mfdataset_can_open_files_with_cftime_index():
def test_open_mfdataset_can_open_files_with_cftime_index(tmp_path):
T = xr.cftime_range("20010101", "20010501", calendar="360_day")
Lon = np.arange(100)
data = np.random.random((T.size, Lon.size))
da = xr.DataArray(data, coords={"time": T, "Lon": Lon}, name="test")
file_path = tmp_path / "test.nc"
da.to_netcdf(file_path)
with cluster() as (s, [a, b]):
with Client(s["address"]):
with tempfile.TemporaryDirectory() as td:
data_file = os.path.join(td, "test.nc")
da.to_netcdf(data_file)
for parallel in (False, True):
with xr.open_mfdataset(data_file, parallel=parallel) as tf:
assert_identical(tf["test"], da)
for parallel in (False, True):
with xr.open_mfdataset(file_path, parallel=parallel) as tf:
assert_identical(tf["test"], da)


@pytest.mark.parametrize("engine,nc_format", ENGINES_AND_FORMATS)
Expand Down