move shift_months to liboffsets, unify implementations of Q/M/Y offsets, #18375
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
algebra unification
…libs-offsets-shift_months
jreback
requested changes
Nov 19, 2017
| @@ -19,6 +21,10 @@ from pandas._libs.tslib import monthrange | |||
|
|
|||
| from conversion cimport tz_convert_single, pydt_to_i8 | |||
| from frequencies cimport get_freq_code | |||
| from nattype cimport NPY_NAT | |||
pandas/_libs/tslibs/offsets.pyx
Outdated
| return days_per_month_table[is_leapyear(year)][month - 1] | ||
|
|
||
|
|
||
| cdef inline int _year_add_months(pandas_datetimestruct dts, int months) nogil: |
Codecov Report
@@ Coverage Diff @@
## master #18375 +/- ##
==========================================
- Coverage 91.38% 91.32% -0.07%
==========================================
Files 164 164
Lines 49797 49703 -94
==========================================
- Hits 45508 45391 -117
- Misses 4289 4312 +23
Continue to review full report at Codecov.
|
jreback
reviewed
Nov 20, 2017
| @@ -577,7 +577,10 @@ def pxd(name): | |||
| 'pyxfile': '_libs/tslibs/offsets', | |||
| 'pxdfiles': ['_libs/src/util', | |||
| '_libs/tslibs/conversion', | |||
| '_libs/tslibs/frequencies']}, | |||
| '_libs/tslibs/frequencies', | |||
There was a problem hiding this comment.
in future prs can reduce the tslib.pyx deps I think now that lots of things are moved out.
jreback
approved these changes
Nov 20, 2017
jreback
reviewed
Nov 20, 2017
| def shift_months(int64_t[:] dtindex, int months, object day=None): | ||
| """ | ||
| Given an int64-based datetime index, shift all elements | ||
| specified number of months using DateOffset semantics |
There was a problem hiding this comment.
can you doc-string things as well (here just fix the formatting to numpydoc)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This moves
tslib.shift_monthsto liboffsets.After several algebra-simplifing PRs, here's the payoff. Nearly all of the logic in M/Q/Y offset subclasses is now identical, so can be moved into the parent classes.
BusinessMonthEndgains anonOffsetmethod (instead of inheriting fromDateOffset)The Year and Day algebra is simple enough that the diff should be obvious. The
QuarterFoo.applymethods are require a few steps of simplification before they become identical. I decided just to push the whole thing rather than drag it out.