Skip to content

Fix arithmetic errors with timedelta64 dtypes #22390

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 14 commits into from
Aug 23, 2018
Merged

Fix arithmetic errors with timedelta64 dtypes #22390

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
05b2c50
un-xfail tests fixed by #22163
jbrockmendel Aug 16, 2018
6dbb2e6
Fix Index[object] op with Series[timedelta64]
jbrockmendel Aug 16, 2018
8c3df15
Fix multiplication of timedelta with Series
jbrockmendel Aug 16, 2018
a7502ea
un-xfail no-longer-broken tests
jbrockmendel Aug 16, 2018
ef14164
Fix numeric Series add/sub timedelta64array/index
jbrockmendel Aug 16, 2018
6b02691
Fix/test numeric index ops with timedelta64 array/index/series
jbrockmendel Aug 16, 2018
b856744
flake8 fixup
jbrockmendel Aug 16, 2018
c493b23
add GH references
jbrockmendel Aug 16, 2018
000e6df
Fixup remove unused import
jbrockmendel Aug 16, 2018
19a18ee
Merge branch 'master' of https://github.com/pandas-dev/pandas into rbug
jbrockmendel Aug 20, 2018
6bd5d0e
implement maybe_upcast_for_op
jbrockmendel Aug 20, 2018
16e0cfe
Merge branch 'master' of https://github.com/pandas-dev/pandas into rbug
jbrockmendel Aug 21, 2018
40463a6
Merge branch 'master' of https://github.com/pandas-dev/pandas into rbug
jbrockmendel Aug 22, 2018
cdfb3bf
move notes to Timedelta section
jbrockmendel Aug 22, 2018
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
un-xfail no-longer-broken tests
  • Loading branch information
@jbrockmendel
jbrockmendel committed Aug 16, 2018
commit a7502ea86f85e4a9f64ae4298536b8ea2641c3ea
6 changes: 0 additions & 6 deletions pandas/tests/arithmetic/test_numeric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,6 @@ def test_numeric_arr_mul_tdscalar(self, scalar_td, index, box):
Timedelta(days=1).to_pytimedelta()],
ids=lambda x: type(x).__name__)
def test_numeric_arr_rdiv_tdscalar(self, scalar_td, index, box):

if box is Series and type(scalar_td) is timedelta:
raise pytest.xfail(reason="TODO: Figure out why this case fails")
if box is pd.DataFrame and isinstance(scalar_td, timedelta):
raise pytest.xfail(reason="TODO: Figure out why this case fails")

expected = TimedeltaIndex(['1 Day', '12 Hours'])

index = tm.box_expected(index, box)
Expand Down