Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

_season_from_months can now handle np.nan #5876

Merged
merged 12 commits into from
Jan 11, 2022
Merged

_season_from_months can now handle np.nan #5876

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7a10fe0
_season_from_months can now handle np.nan
pierreloicq Oct 19, 2021
0a968df
Merge branch 'main' into pr/5876
Illviljan Oct 24, 2021
38e484c
Run black
Illviljan Oct 24, 2021
f315e72
Remove duplicated import
Illviljan Oct 24, 2021
f8e82a9
returns np.nan and removed the useless attribution
pierreloicq Oct 25, 2021
4efe64c
added test
pierreloicq Oct 25, 2021
817b42f
applied black recommendations
pierreloicq Oct 26, 2021
d12e7c7
Apply suggestions from code review
pierreloicq Jan 10, 2022
066121f
Merge branch 'pydata:main' into pierreloicq-patch-1
pierreloicq Jan 10, 2022
8fb78f7
update whatsnew
pierreloicq Jan 10, 2022
67eedfe
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 10, 2022
11d2f13
Correction on the credits
pierreloicq Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/whats-new.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ Bug fixes
- Fix applying function with non-xarray arguments using :py:func:`xr.map_blocks`.
By `Cindy Chiao <https://github.com/tcchiao>`_.

- `dt.season <https://xarray.pydata.org/en/stable/generated/xarray.DataArray.dt.season.html>`_ can now handle NaN and NaT. (:pull:`5876`).
By `Pierre Loicq <https://github.com/pierreloicq>`_ and `Spencer Clark <https://github.com/spencerkclark>`_.
pierreloicq marked this conversation as resolved.
Show resolved Hide resolved


Documentation
~~~~~~~~~~~~~

Expand Down
15 changes: 13 additions & 2 deletions xarray/core/accessor_dt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,20 @@
def _season_from_months(months):
"""Compute season (DJF, MAM, JJA, SON) from month ordinal"""
# TODO: Move "season" accessor upstream into pandas
seasons = np.array(["DJF", "MAM", "JJA", "SON"])
seasons = np.array(["DJF", "MAM", "JJA", "SON", "nan"])
months = np.asarray(months)
return seasons[(months // 3) % 4]

with warnings.catch_warnings():
warnings.filterwarnings(
"ignore", message="invalid value encountered in floor_divide"
)
warnings.filterwarnings(
"ignore", message="invalid value encountered in remainder"
)
idx = (months // 3) % 4

idx[np.isnan(idx)] = 4
return seasons[idx.astype(int)]


def _access_through_cftimeindex(values, name):
Expand Down
2 changes: 2 additions & 0 deletions xarray/tests/test_accessor_dt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ def test_dask_accessor_method(self, method, parameters) -> None:

def test_seasons(self) -> None:
dates = pd.date_range(start="2000/01/01", freq="M", periods=12)
dates = dates.append(pd.Index([np.datetime64("NaT")]))
dates = xr.DataArray(dates)
seasons = xr.DataArray(
[
Expand All @@ -237,6 +238,7 @@ def test_seasons(self) -> None:
"SON",
"SON",
"DJF",
"nan",
]
)

Expand Down