Skip to content

Sync with latest version of cftime (v1.0.4) #3430

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

Merged
dcherian merged 6 commits into from
Oct 22, 2019
Merged

Sync with latest version of cftime (v1.0.4) #3430

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
093e792
Remove `dayofwk=-1`-- not needed for cftime>=1.0.4
andersy005 Oct 22, 2019
6cc48f1
Maintain backwards compatibility
andersy005 Oct 22, 2019
9a1a4b1
Maintain backwards compatibility
andersy005 Oct 22, 2019
423bea5
Maintain backwards compatibility
andersy005 Oct 22, 2019
24b4fc7
Add missing import
andersy005 Oct 22, 2019
e4d44ad
Update whats-new
andersy005 Oct 22, 2019
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
6 changes: 1 addition & 5 deletions xarray/coding/cftime_offsets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,7 @@ def _shift_month(date, months, day_option="start"):
day = _days_in_month(reference)
else:
raise ValueError(day_option)
# dayofwk=-1 is required to update the dayofwk and dayofyr attributes of
# the returned date object in versions of cftime between 1.0.2 and
# 1.0.3.4. It can be removed for versions of cftime greater than
# 1.0.3.4.
return date.replace(year=year, month=month, day=day, dayofwk=-1)
return date.replace(year=year, month=month, day=day)


def roll_qtrday(other, n, month, day_option, modby=3):
Expand Down
5 changes: 0 additions & 5 deletions xarray/coding/cftimeindex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,6 @@ def _parse_iso8601_with_reso(date_type, timestr):
replace[attr] = int(value)
resolution = attr

# dayofwk=-1 is required to update the dayofwk and dayofyr attributes of
# the returned date object in versions of cftime between 1.0.2 and
# 1.0.3.4. It can be removed for versions of cftime greater than
# 1.0.3.4.
replace["dayofwk"] = -1
return default.replace(**replace), resolution


Expand Down