Skip to content

Commit 37e5ae7

Browse files
authored
fix pandas-dev tests (#3491)
* Don't initialize DataArrays with Pandas attrs. * re-enable pandas-dev CI.
1 parent 3bb0414 commit 37e5ae7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ci/azure/install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ steps:
1616
--pre \
1717
--upgrade \
1818
matplotlib \
19-
pandas=0.26.0.dev0+628.g03c1a3db2 \ # FIXME https://github.com/pydata/xarray/issues/3440
19+
pandas \
2020
scipy
2121
# numpy \ # FIXME https://github.com/pydata/xarray/issues/3409
2222
pip install \

xarray/core/dataarray.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
from .dataset import Dataset, merge_indexes, split_indexes
5252
from .formatting import format_item
5353
from .indexes import Indexes, default_indexes
54+
from .merge import PANDAS_TYPES
5455
from .options import OPTIONS
5556
from .utils import Default, ReprObject, _check_inplace, _default, either_dict_or_kwargs
5657
from .variable import (
@@ -357,7 +358,7 @@ def __init__(
357358
dims = getattr(data, "dims", getattr(coords, "dims", None))
358359
if name is None:
359360
name = getattr(data, "name", None)
360-
if attrs is None:
361+
if attrs is None and not isinstance(data, PANDAS_TYPES):
361362
attrs = getattr(data, "attrs", None)
362363
if encoding is None:
363364
encoding = getattr(data, "encoding", None)

0 commit comments

Comments
 (0)