Skip to content

BUG: Cleanup timedelta offset#23439

Merged
jreback merged 2 commits intopandas-dev:masterfrom
sinhrks:timedelta_unit
Nov 6, 2018
Merged

BUG: Cleanup timedelta offset#23439
jreback merged 2 commits intopandas-dev:masterfrom
sinhrks:timedelta_unit

Conversation

@sinhrks
Copy link
Copy Markdown
Member

@sinhrks sinhrks commented Nov 1, 2018

Fixed to use same unit parsing logic in Timedelta and to_timedelta. Needs to update after #23264 and #23259.

@pep8speaks
Copy link
Copy Markdown

pep8speaks commented Nov 1, 2018

Hello @sinhrks! Thanks for submitting the PR.

@sinhrks sinhrks added Bug Timedelta Timedelta data type labels Nov 1, 2018
@sinhrks sinhrks mentioned this pull request Nov 1, 2018
Merged
4 tasks
@codecov
Copy link
Copy Markdown

codecov bot commented Nov 1, 2018 •
edited
Loading

Codecov Report

Merging #23439 into master will decrease coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #23439      +/-   ##
==========================================
- Coverage   92.23%   92.23%   -0.01%     
==========================================
  Files         161      161              
  Lines       51197    51189       -8     
==========================================
- Hits        47220    47212       -8     
  Misses       3977     3977
Flag Coverage Δ
#multiple 90.61% <100%> (-0.01%) ⬇️
#single 42.26% <100%> (-0.01%) ⬇️
Impacted Files Coverage Δ
pandas/core/tools/timedeltas.py 98.18% <100%> (-0.24%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 24ab22f...04f3ceb. Read the comment docs.

jbrockmendel
jbrockmendel reviewed Nov 1, 2018
View reviewed changes
pandas/_libs/tslibs/timedeltas.pxd Outdated
cpdef int64_t delta_to_nanoseconds(delta) except? -1
cpdef convert_to_timedelta64(object ts, object unit)

# Exposed for Timedelta, not intended for outside use.
Copy link
Copy Markdown
Member

@jbrockmendel jbrockmendel Nov 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this cimported by another cython module? If not, doesn’t need to be in the pxd file

@sinhrks sinhrks force-pushed the timedelta_unit branch 2 times, most recently from d55f00c to 3ade6a9 Compare November 2, 2018 01:06
jreback
jreback requested changes Nov 2, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@jreback jreback left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test comment, otherwise lgtm.

pandas/tests/scalar/timedelta/test_timedelta.py Outdated
expected = TimedeltaIndex([np.timedelta64(i, np_unit)
for i in np.arange(5).tolist()])
tm.assert_index_equal(result, expected)
for wrapper in [np.array, list, pd.Index]:
Copy link
Copy Markdown
Contributor

@jreback jreback Nov 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you make this a parameter (call it box)

Copy link
Copy Markdown
Member Author

@sinhrks sinhrks Nov 5, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx, fixed.

@jreback jreback added this to the 0.24.0 milestone Nov 2, 2018
@jreback jreback merged commit 11c0d28 into pandas-dev:master Nov 6, 2018
@jreback
Copy link
Copy Markdown
Contributor

jreback commented Nov 6, 2018

thanks @sinhrks

@jorisvandenbossche
Copy link
Copy Markdown
Member

jorisvandenbossche commented Nov 8, 2018

Personally, I think we should make a distinction between which units are accepted for the unit parameter, and which are parsed inside a string.

For parsing a string, it is fine to accept both '15m', '15min', '15minute', '15minutes and '15T'. But for the unit keyword, is it needed to allow this flexibility?
I would say that just the standard units (the numpy ones, as we had now) + maybe the abbreviations as used in our freq strings should be enough no? (so 'm' and 'T')

(and to be clear, the rest of this PR, fixing the inconsistency of what strings are parsed is of course totally fine!)

@ryankarlos ryankarlos mentioned this pull request Nov 11, 2018
Merged
4 tasks
@sinhrks
Copy link
Copy Markdown
Member Author

sinhrks commented Nov 13, 2018

@jorisvandenbossche I kept existing behaviour, but it is better to clarify the policy. It should be consistent with period also.

pd.Period('2011-01', freq='min')
# Period('2011-01-01 00:00', 'T')

pd.Period('2011-01', freq='hour')
# ValueError: Invalid frequency: hour

JustinZhengBC pushed a commit to JustinZhengBC/pandas that referenced this pull request Nov 14, 2018
@sinhrks @JustinZhengBC
BUG: Cleanup timedelta offset (pandas-dev#23439)
2b626d5
tm9k1 pushed a commit to tm9k1/pandas that referenced this pull request Nov 19, 2018
@sinhrks @tm9k1
BUG: Cleanup timedelta offset (pandas-dev#23439)
6112ae7
Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
@sinhrks @Pingviinituutti
BUG: Cleanup timedelta offset (pandas-dev#23439)
654bf8c
Pingviinituutti pushed a commit to Pingviinituutti/pandas that referenced this pull request Feb 28, 2019
@sinhrks @Pingviinituutti
BUG: Cleanup timedelta offset (pandas-dev#23439)
6848116
@mroeschke mroeschke mentioned this pull request Mar 5, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jbrockmendel jbrockmendel jbrockmendel left review comments

@jreback jreback jreback approved these changes

Assignees

No one assigned

Labels

Bug Timedelta Timedelta data type

Projects

None yet

Milestone

0.24.0

Development

Successfully merging this pull request may close these issues.

pd.Timedelta() cannot process offset alias T while pd.infer_freq() return this format.

5 participants

@sinhrks @pep8speaks @jreback @jorisvandenbossche @jbrockmendel