From 9fbe353d55feddb1cc42a8957171a07b23dd403f Mon Sep 17 00:00:00 2001 From: Deepak Cherian Date: Tue, 17 Sep 2019 18:50:04 +0000 Subject: [PATCH] auto_combine deprecation to 0.14 (#3314) --- xarray/backends/api.py | 2 +- xarray/core/combine.py | 4 ++-- xarray/tests/test_combine.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xarray/backends/api.py b/xarray/backends/api.py index 1f0869cfc53..0d6dedac57e 100644 --- a/xarray/backends/api.py +++ b/xarray/backends/api.py @@ -915,7 +915,7 @@ def open_mfdataset( # Remove this after deprecation cycle from #2616 is complete basic_msg = dedent( """\ - In xarray version 0.13 the default behaviour of `open_mfdataset` + In xarray version 0.14 the default behaviour of `open_mfdataset` will change. To retain the existing behavior, pass combine='nested'. To use future default behavior, pass combine='by_coords'. See diff --git a/xarray/core/combine.py b/xarray/core/combine.py index e35bb51e030..be7fd86555c 100644 --- a/xarray/core/combine.py +++ b/xarray/core/combine.py @@ -716,7 +716,7 @@ def auto_combine( if not from_openmfds: basic_msg = dedent( """\ - In xarray version 0.13 `auto_combine` will be deprecated. See + In xarray version 0.14 `auto_combine` will be deprecated. See http://xarray.pydata.org/en/stable/combining.html#combining-multi""" ) warnings.warn(basic_msg, FutureWarning, stacklevel=2) @@ -758,7 +758,7 @@ def auto_combine( message += dedent( """\ The datasets supplied require both concatenation and merging. From - xarray version 0.13 this will operation will require either using the + xarray version 0.14 this will operation will require either using the new `combine_nested` function (or the `combine='nested'` option to open_mfdataset), with a nested list structure such that you can combine along the dimensions {}. Alternatively if your datasets have global diff --git a/xarray/tests/test_combine.py b/xarray/tests/test_combine.py index 1abca30d199..6037669ac07 100644 --- a/xarray/tests/test_combine.py +++ b/xarray/tests/test_combine.py @@ -714,7 +714,7 @@ def test_check_for_impossible_ordering(self): @pytest.mark.filterwarnings( - "ignore:In xarray version 0.13 `auto_combine` " "will be deprecated" + "ignore:In xarray version 0.14 `auto_combine` " "will be deprecated" ) @pytest.mark.filterwarnings("ignore:Also `open_mfdataset` will no longer") @pytest.mark.filterwarnings("ignore:The datasets supplied")