Skip to content

Commit 433bdd1

Browse files
authored
Merge pull request #3908 from Unidata/backport-pr-3902
Silence FututreWarning raised by xarray v2025.08.0 (backport)
2 parents 5553734 + cf38beb commit 433bdd1

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

ci/test_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ pytest==8.3.5
33
pytest-mpl==0.17.0
44
netCDF4==1.7.2
55
coverage==7.8.0
6-
vcrpy==7.0.0
6+
vcrpy==7.0.0

src/metpy/xarray.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ def parse_cf(self, varname=None, coordinates=None):
810810
if np.iterable(varname) and not isinstance(varname, str):
811811
# If non-string iterable is given, apply recursively across the varnames
812812
subset = xr.merge([self.parse_cf(single_varname, coordinates=coordinates)
813-
for single_varname in varname])
813+
for single_varname in varname], compat='no_conflicts')
814814
subset.attrs = self._dataset.attrs
815815
return subset
816816

0 commit comments

Comments
 (0)