Skip to content

Commit

Permalink
revert style change
Browse files Browse the repository at this point in the history
  • Loading branch information
holymonson committed Jul 23, 2018
1 parent 98c3ac9 commit 21c1c7c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 2 additions & 0 deletions pandas/tests/frame/test_arithmetic.py
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ def test_df_sub_datetime64_not_ns(self):
tm.assert_frame_equal(res, expected)

def test_timestamp_df_add_dateoffset(self):
# GH 21610
expected = pd.DataFrame([pd.Timestamp('2019')])
result = pd.DataFrame([pd.Timestamp('2018')]) + pd.DateOffset(years=1)
tm.assert_frame_equal(expected, result)
Expand All @@ -229,6 +230,7 @@ def test_timestamp_df_add_dateoffset(self):
datetime.date(2017, 1, 1),
])
def test_timestamp_df_sub_timestamp(self, other):
# GH 8554 12437
expected = pd.DataFrame([pd.Timedelta('365d')])
result = pd.DataFrame([pd.Timestamp('2018')]) - other
tm.assert_frame_equal(expected, result)
Expand Down
18 changes: 8 additions & 10 deletions pandas/tests/internals/test_internals.py
Original file line number Diff line number Diff line change
Expand Up @@ -1248,16 +1248,14 @@ class TestCanHoldElement(object):
operator.pow,
], ids=lambda x: x.__name__)
def test_binop_other(self, op, value, dtype):
skip = {
(operator.add, 'bool'),
(operator.sub, 'bool'),
(operator.mul, 'bool'),
(operator.truediv, 'bool'),
(operator.mod, 'i8'),
(operator.mod, 'complex128'),
(operator.mod, '<m8[ns]'),
(operator.pow, 'bool'),
}
skip = {(operator.add, 'bool'),
(operator.sub, 'bool'),
(operator.mul, 'bool'),
(operator.truediv, 'bool'),
(operator.mod, 'i8'),
(operator.mod, 'complex128'),
(operator.mod, '<m8[ns]'),
(operator.pow, 'bool')}
if (op, dtype) in skip:
pytest.skip("Invalid combination {},{}".format(op, dtype))
e = DummyElement(value, dtype)
Expand Down

0 comments on commit 21c1c7c

Please sign in to comment.