From c793ecceba5393aac9be0bbdf91a53a3175ecccc Mon Sep 17 00:00:00 2001 From: Aaron David Schneider Date: Fri, 28 May 2021 14:56:42 +0200 Subject: [PATCH] fix combine_by_coords (#267) * fix combine_by_coords * change to new only for versions newer than previous xarray version * fix tests --- xmitgcm/mds_store.py | 4 +++- xmitgcm/test/test_mds_store.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xmitgcm/mds_store.py b/xmitgcm/mds_store.py index a7830a8..0d5fc51 100644 --- a/xmitgcm/mds_store.py +++ b/xmitgcm/mds_store.py @@ -259,8 +259,10 @@ def open_mdsdataset(data_dir, grid_dir=None, ds = xr.auto_combine(datasets) elif xr.__version__ < '0.15.2': ds = xr.combine_by_coords(datasets) - else: + elif xr.__version__ < '0.18.0': ds = xr.combine_by_coords(datasets, compat='override', coords='minimal', combine_attrs='drop') + else: + ds = xr.combine_by_coords(datasets, compat='override', coords='minimal', combine_attrs='drop_conflicts') if swap_dims: ds = _swap_dimensions(ds, geometry) diff --git a/xmitgcm/test/test_mds_store.py b/xmitgcm/test/test_mds_store.py index e7bea65..b8c3802 100644 --- a/xmitgcm/test/test_mds_store.py +++ b/xmitgcm/test/test_mds_store.py @@ -288,7 +288,7 @@ def test_swap_dims(all_mds_datadirs): ['_bounds', '_center', '_interface']] expected_dims += extra_dims - assert list(ds.dims.keys()) == expected_dims + assert set(ds.dims.keys()) == set(expected_dims) # make sure swapping works with multiple iters ds = xmitgcm.open_mdsdataset(dirname, geometry=expected['geometry'],