Skip to content

Commit c82ea08

Browse files
committed
revert style change
1 parent 281ae71 commit c82ea08

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

pandas/tests/frame/test_arithmetic.py

+2
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ def test_df_sub_datetime64_not_ns(self):
213213
tm.assert_frame_equal(res, expected)
214214

215215
def test_timestamp_df_add_dateoffset(self):
216+
# GH 21610
216217
expected = pd.DataFrame([pd.Timestamp('2019')])
217218
result = pd.DataFrame([pd.Timestamp('2018')]) + pd.DateOffset(years=1)
218219
tm.assert_frame_equal(expected, result)
@@ -229,6 +230,7 @@ def test_timestamp_df_add_dateoffset(self):
229230
datetime.date(2017, 1, 1),
230231
])
231232
def test_timestamp_df_sub_timestamp(self, other):
233+
# GH 8554 12437
232234
expected = pd.DataFrame([pd.Timedelta('365d')])
233235
result = pd.DataFrame([pd.Timestamp('2018')]) - other
234236
tm.assert_frame_equal(expected, result)

pandas/tests/internals/test_internals.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -1248,16 +1248,14 @@ class TestCanHoldElement(object):
12481248
operator.pow,
12491249
], ids=lambda x: x.__name__)
12501250
def test_binop_other(self, op, value, dtype):
1251-
skip = {
1252-
(operator.add, 'bool'),
1253-
(operator.sub, 'bool'),
1254-
(operator.mul, 'bool'),
1255-
(operator.truediv, 'bool'),
1256-
(operator.mod, 'i8'),
1257-
(operator.mod, 'complex128'),
1258-
(operator.mod, '<m8[ns]'),
1259-
(operator.pow, 'bool'),
1260-
}
1251+
skip = {(operator.add, 'bool'),
1252+
(operator.sub, 'bool'),
1253+
(operator.mul, 'bool'),
1254+
(operator.truediv, 'bool'),
1255+
(operator.mod, 'i8'),
1256+
(operator.mod, 'complex128'),
1257+
(operator.mod, '<m8[ns]'),
1258+
(operator.pow, 'bool')}
12611259
if (op, dtype) in skip:
12621260
pytest.skip("Invalid combination {},{}".format(op, dtype))
12631261
e = DummyElement(value, dtype)

0 commit comments

Comments
 (0)