8000 BUG: Fix ndarray + DataFrame ops by jbrockmendel · Pull Request #23114 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

BUG: Fix ndarray + DataFrame ops #23114

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 10 commits into from
Oct 14, 2018
Merged

BUG: Fix ndarray + DataFrame ops #23114

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c158048
Fix ndarray with frame op
jbrockmendel Oct 10, 2018
a28302a
typo fixup
jbrockmendel Oct 12, 2018
8183c20
Merge branch 'master' of https://github.com/pandas-dev/pandas into ar…
jbrockmendel Oct 12, 2018
4e84e53
set __array_priority__
jbrockmendel Oct 12, 2018
d280cf1
update tests
jbrockmendel Oct 13, 2018
d62a6c8
fix test assertion
jbrockmendel Oct 13, 2018
afd53e0
update test
jbrockmendel Oct 13, 2018
bc55de7
un-xfail now-passing test
jbrockmendel Oct 13, 2018
c0100b2
whatsnew
jbrockmendel Oct 14, 2018
ed7174c
Merge branch 'master' of https://github.com/pandas-dev/pandas into ar…
jbrockmendel Oct 14, 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
typo fixup
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 12, 2018
commit a28302a3acbd5c33e491a9269c95ec168427e7e9
2 changes: 1 addition & 1 deletion pandas/tests/arithmetic/test_numeric.py
709F View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def test_numeric_arr_rdiv_tdscalar(self, three_days, numeric_idx, box):
if box is not pd.Index and broken:
# np.timedelta64(3, 'D') / 2 == np.timedelta64(1, 'D')
raise pytest.xfail("timedelta64 not converted to nanos; "
"Tick division not imlpemented")
"Tick division not implemented")

expected = TimedeltaIndex(['3 Days', '36 Hours'])

Expand Down
0