Skip to content

Fix Index __mul__-like ops with timedelta scalars #19333

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 29 commits into from
Feb 22, 2018
Merged

Fix Index __mul__-like ops with timedelta scalars #19333

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fecc906
update whatsnew
jbrockmendel Jan 21, 2018
7e8d5ff
add rmul test to timedeltas
jbrockmendel Jan 21, 2018
d2423ca
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Jan 21, 2018
1dd4ccf
handle Index * timedelta, with tests
jbrockmendel Jan 21, 2018
71811c8
whatsnew note
jbrockmendel Jan 21, 2018
4c2c74b
division tests, fix typos
jbrockmendel Jan 21, 2018
d45ba92
Fix typo
jbrockmendel Jan 21, 2018
4abd61a
restore whitespace
jbrockmendel Jan 21, 2018
11424b0
fill in GH issue
jbrockmendel Jan 21, 2018
ee48c8b
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Jan 21, 2018
1c97489
whitespace fixup from merge
jbrockmendel Jan 21, 2018
23b7f44
arrange whatsnew notes
jbrockmendel Jan 22, 2018
086be08
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Jan 22, 2018
6e04aba
comment, requested edits
jbrockmendel Jan 22, 2018
1012939
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Jan 23, 2018
2fb3688
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Jan 25, 2018
0ed9276
xfail RangeIndex test
jbrockmendel Jan 25, 2018
e798653
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Jan 25, 2018
a04f970
fix pytest xfail problem
jbrockmendel Jan 25, 2018
878be31
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Jan 31, 2018
d62983d
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Feb 1, 2018
040b1e4
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Feb 2, 2018
d7dfba9
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Feb 5, 2018
a46acb9
remove xfail
jbrockmendel Feb 13, 2018
e6fa53b
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Feb 13, 2018
814e858
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Feb 21, 2018
080c06c
troubleshoot RangeIndex test failure
jbrockmendel Feb 21, 2018
22d155e
fixup reversed op
jbrockmendel Feb 21, 2018
9e3dec4
Merge branch 'master' of https://github.com/pandas-dev/pandas into id…
jbrockmendel Feb 21, 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
Fix typo
  • Loading branch information
@jbrockmendel
jbrockmendel committed Jan 21, 2018
commit d45ba924bf7ce552769069e398c27449ee758cd7
2 changes: 1 addition & 1 deletion pandas/tests/indexes/test_numeric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_index_mul_timedelta(self, scalar_td, index):
Timedelta(days=1).to_timedelta64(),
Timedelta(days=1).to_pytimedelta()])
def test_index_rdiv_timedelta(self, scalar_td, index):
expected = pd.TimedeltaIndex(['NaT', '1 Day', '12 Hours'])
expected = pd.TimedeltaIndex(['1 Day', '12 Hours'])

result = scalar_td / index
tm.assert_index_equal(result, expected)
Copy link
Contributor

Choose a reason for hiding this comment

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

can you also test that the commute raises here

Expand Down