Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jswhit committed Sep 26, 2020
1 parent 440e7d7 commit a91f41f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ version 1.3.0 (not yet released)
The default calendar is now None (the instance is not calendar-aware unless a valid
calendar string is provided). The previous default was 'standard', but the instances were
not calendar-aware unless created directly by the various calendar-specific sub-class
constructors (issue #198).
constructors (issue #198). Much code moved from cython to python as part of this change,
so some performance degradation is expected.

version 1.2.1 (release tag v1.2.1rel)
=====================================
Expand Down
4 changes: 2 additions & 2 deletions cftime/_cftime.py
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,7 @@ def assert_valid_date(dt,is_leap,julian_gregorian_mixed,has_year_zero=False,
if dt.microsecond < 0 or dt.microsecond > 999999:
raise ValueError("invalid microsecond provided in {0!r}".format(dt))

## beginning of block duplicated in _cftime_utils.pyx
## beginning of block duplicated in cython code _cftime_utils.pyx
## if this block is commented out, and "from ._cftime_utils import" line up top
## is uncommented, there is a ~50% performance improvement.
#
Expand Down Expand Up @@ -1784,7 +1784,7 @@ def assert_valid_date(dt,is_leap,julian_gregorian_mixed,has_year_zero=False,
#
# return year,month,day,dow,doy
#
#### end of block duplicated in _cftime_utils.pyx
#### end of block duplicated in cython code _cftime_utils.pyx

def JulianDayFromDate(date, calendar='standard'):
"""JulianDayFromDate(date, calendar='standard')
Expand Down

0 comments on commit a91f41f

Please sign in to comment.