From a91f41f171620a61a17a04f7823a6ac2f830d1d1 Mon Sep 17 00:00:00 2001 From: jswhit Date: Fri, 25 Sep 2020 20:23:50 -0600 Subject: [PATCH] update --- Changelog | 3 ++- cftime/_cftime.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 427bfbc7..34275b17 100644 --- a/Changelog +++ b/Changelog @@ -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) ===================================== diff --git a/cftime/_cftime.py b/cftime/_cftime.py index 020cd6c3..1d0687d0 100644 --- a/cftime/_cftime.py +++ b/cftime/_cftime.py @@ -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. # @@ -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')