From fa2c0c15e8388c56233953bbbd4859466dd7330f Mon Sep 17 00:00:00 2001 From: dcherian Date: Thu, 7 Nov 2019 07:48:16 -0700 Subject: [PATCH 1/2] Don't initialize DataArrays with Pandas attrs. --- xarray/core/dataarray.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xarray/core/dataarray.py b/xarray/core/dataarray.py index 35ee90fb5c8..3fa6323823f 100644 --- a/xarray/core/dataarray.py +++ b/xarray/core/dataarray.py @@ -52,6 +52,7 @@ from .dataset import Dataset, merge_indexes, split_indexes from .formatting import format_item from .indexes import Indexes, default_indexes +from .merge import PANDAS_TYPES from .options import OPTIONS from .utils import Default, ReprObject, _default, _check_inplace, either_dict_or_kwargs from .variable import ( @@ -358,7 +359,7 @@ def __init__( dims = getattr(data, "dims", getattr(coords, "dims", None)) if name is None: name = getattr(data, "name", None) - if attrs is None: + if attrs is None and not isinstance(data, PANDAS_TYPES): attrs = getattr(data, "attrs", None) if encoding is None: encoding = getattr(data, "encoding", None) From 8703fe24f37e441516225d16914a807aad68cc96 Mon Sep 17 00:00:00 2001 From: dcherian Date: Thu, 7 Nov 2019 08:27:23 -0700 Subject: [PATCH 2/2] re-enable pandas-dev CI. --- ci/azure/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/install.yml b/ci/azure/install.yml index 8da0ac1b5de..fee886ba804 100644 --- a/ci/azure/install.yml +++ b/ci/azure/install.yml @@ -16,7 +16,7 @@ steps: --pre \ --upgrade \ matplotlib \ - pandas=0.26.0.dev0+628.g03c1a3db2 \ # FIXME https://github.com/pydata/xarray/issues/3440 + pandas \ scipy # numpy \ # FIXME https://github.com/pydata/xarray/issues/3409 pip install \