Skip to content

Masking and overflow checks for datetimeindex and timedeltaindex ops #18020

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.

Sign up for GitHub

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 17 commits into from
Nov 4, 2017
Merged

Masking and overflow checks for datetimeindex and timedeltaindex ops #18020

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e9dd35b
masking and overflow checks for datetimeindex and timedeltaindex ops
jbrockmendel Oct 29, 2017
36aea69
flake8 fixup
jbrockmendel Oct 29, 2017
dd1eddd
add todo notes
jbrockmendel Oct 29, 2017
92afc80
Move test somewhere it will actually get run
jbrockmendel Oct 29, 2017
de663a1
remove invalid test
jbrockmendel Oct 29, 2017
183e8d0
Move towards parameterized tests; fix for np.datetime64 arith #7996
jbrockmendel Oct 29, 2017
75a403c
test cases for datetime64/timedelta64 with different units
jbrockmendel Oct 29, 2017
ff72d98
Remove new test file; move two currently-failing tests to existing mo…
jbrockmendel Oct 29, 2017
ac246b1
typo fixup
jbrockmendel Oct 29, 2017
05254e2
fixup NameErrors
jbrockmendel Oct 30, 2017
7214823
Merge branch 'master' of https://github.com/pandas-dev/pandas into arith
jbrockmendel Oct 30, 2017
f048ffa
to_datetime-->to_pydatetime; fixes unrelated test failure
jbrockmendel Oct 30, 2017
7be5984
whatsnew notes
jbrockmendel Oct 31, 2017
95f801f
Merge branch 'master' of https://github.com/pandas-dev/pandas into arith
jbrockmendel Nov 1, 2017
586d872
Merge branch 'master' of https://github.com/pandas-dev/pandas into arith
jbrockmendel Nov 3, 2017
24dd75b
clarify todo note per reviewre suggestion
jbrockmendel Nov 4, 2017
4dbdfd7
Merge branch 'master' of https://github.com/pandas-dev/pandas into arith
jbrockmendel Nov 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove invalid test
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 29, 2017
commit de663a1837faee4e61ea8d7ead6768e0a094e1e7
12 changes: 0 additions & 12 deletions pandas/tests/indexes/test_datetimelike_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ def test_timedeltaindex_add_timestamp_nat_masking(self):
res2 = tdinat + tspos
assert res2[1] is NaT

def test_timedeltaindex_sub_timestamp_nat_masking(self):
tdinat = pd.to_timedelta(['24658 days 11:15:00', 'NaT'])

# tsneg.value < 0, tspos.value > 0
tsneg = Timestamp('1950-01-01')
tspos = Timestamp('1980-01-01')

res1 = tdinat - tsneg
assert res1[1] is NaT
res2 = tdinat - tspos
assert res2[1] is NaT

def test_timedeltaindex_add_timestamp_overflow(self):
tdimax = pd.to_timedelta(['24658 days 11:15:00', Timedelta.max])
tdimin = pd.to_timedelta(['24658 days 11:15:00', Timedelta.min])
Expand Down