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
update test
  • Loading branch information
@jbrockmendel
jbrockmendel committed Oct 13, 2018
commit afd53e095428ca26cd5e3c4fd905677d4025274e
7 changes: 5 additions & 2 deletions pandas/tests/arithmetic/test_timedelta64.py
7B8B View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,11 @@ def test_td64arr_add_str_invalid(self, box):
@pytest.mark.parametrize('op', [operator.add, ops.radd,
operator.sub, ops.rsub],
ids=lambda x: x.__name__)
def test_td64arr_add_sub_float(self, box_df_broadcast_failure, op, other):
box = box_df_broadcast_failure
def test_td64arr_add_sub_float(self, box, op, other):
if box is pd.DataFrame and isinstance(other, np.ndarray):
pytest.xfail("Tries to broadcast, raising "
"ValueError instead of TypeError")

tdi = TimedeltaIndex(['-1 days', '-1 days'])
tdi = tm.box_expected(tdi, box)

Expand Down
0