-
-
Notifications
You must be signed in to change notification settings - Fork 18.6k
implement Tick division, fix Timedelta.__cmp__ tick #24710
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.
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
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f7b59e4
implement Tick division, fix Timedelta.__cmp__ tick
jbrockmendel 420dfc8
typo fixup
jbrockmendel 15eb30e
Fix comparison
jbrockmendel b4976d8
use fixture
jbrockmendel 1a89a6e
Merge branch 'master' of https://github.com/pandas-dev/pandas into tick1
jbrockmendel 0a9bb74
whatsnew
jbrockmendel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,9 @@ | |
from pandas.core.tools.timedeltas import _coerce_scalar_to_timedelta_type as ct | ||
import pandas.util.testing as tm | ||
|
||
from pandas.tseries.offsets import ( | ||
Day, Hour, Micro, Milli, Minute, Nano, Second) | ||
|
||
|
||
class TestTimedeltaArithmetic(object): | ||
|
||
|
@@ -78,6 +81,27 @@ def test_unary_ops(self): | |
|
||
|
||
class TestTimedeltaComparison(object): | ||
@pytest.mark.parametrize('tick_cls', [Nano, Micro, Milli, Second, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dont' we have this in a fixture? tick_classes? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. just pushed with this change |
||
Minute, Hour, Day]) | ||
def test_compare_tick(self, tick_cls): | ||
off = tick_cls(4) | ||
td = off.delta | ||
assert isinstance(td, Timedelta) | ||
|
||
assert td == off | ||
assert not td != off | ||
assert td <= off | ||
assert td >= off | ||
assert not td < off | ||
assert not td > off | ||
|
||
assert not td == 2 * off | ||
assert td != 2 * off | ||
assert td <= 2 * off | ||
assert td < 2 * off | ||
assert not td >= 2 * off | ||
assert not td > 2 * off | ||
|
||
def test_comparison_object_array(self): | ||
# analogous to GH#15183 | ||
td = Timedelta('2 days') | ||
|
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.