Skip to content

Commit

Permalink
auto_combine deprecation to 0.14 (#3314)
Browse files Browse the repository at this point in the history
  • Loading branch information
dcherian authored Sep 17, 2019
1 parent 99a5adc commit 9fbe353
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion xarray/backends/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions xarray/core/combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion xarray/tests/test_combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 9fbe353

Please sign in to comment.