Skip to content

Commit 6a3d5a4

Browse files
committed
Add try/except block for importing FrozenDict from xarray due to v0.14 change
1 parent ce82267 commit 6a3d5a4

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

src/metpy/io/gini.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2015,2016,2017 MetPy Developers.
1+
# Copyright (c) 2015,2016,2017,2019 MetPy Developers.
22
# Distributed under the terms of the BSD 3-Clause License.
33
# SPDX-License-Identifier: BSD-3-Clause
44
"""Tools to process GINI-formatted products."""
@@ -19,7 +19,10 @@
1919
try:
2020
from xarray import Variable
2121
from xarray.backends.common import AbstractDataStore
22-
from xarray.core.utils import FrozenOrderedDict
22+
try:
23+
from xarray.core.utils import FrozenOrderedDict as FrozenDict
24+
except ImportError:
25+
from xarray.core.utils import FrozenDict
2326
except ImportError:
2427
# This way GiniFile is still usable without xarray
2528
AbstractDataStore = object
@@ -403,21 +406,21 @@ def get_variables(self):
403406
attrs=attrs)
404407
variables.append((name, data_var))
405408

406-
return FrozenOrderedDict(variables)
409+
return FrozenDict(variables)
407410

408411
def get_attrs(self):
409412
"""Get the global attributes.
410413
411414
This is used by `xarray.open_dataset`.
412415
413416
"""
414-
return FrozenOrderedDict(satellite=self.prod_desc.creating_entity,
415-
sector=self.prod_desc.sector_id)
417+
return FrozenDict(satellite=self.prod_desc.creating_entity,
418+
sector=self.prod_desc.sector_id)
416419

417420
def get_dimensions(self):
418421
"""Get the file's dimensions.
419422
420423
This is used by `xarray.open_dataset`.
421424
422425
"""
423-
return FrozenOrderedDict(x=self.prod_desc.nx, y=self.prod_desc.ny)
426+
return FrozenDict(x=self.prod_desc.nx, y=self.prod_desc.ny)

0 commit comments

Comments
 (0)