Skip to content

Commit b7fc8bb

Browse files
gfyounggfyoung
committed
MAINT: Remove assert_equal from testing.py
1 parent 3119e90 commit b7fc8bb

23 files changed

+67
-85
lines changed

‎pandas/tests/core/computation/test_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_invalid_numexpr_version(engine, parser):
3030
def testit():
3131
a, b = 1, 2 # noqa
3232
res = pd.eval('a + b', engine=engine, parser=parser)
33-
tm.assert_equal(res, 3)
33+
assert res == 3
3434

3535
if engine == 'numexpr':
3636
try:

‎pandas/tests/core/computation/test_eval.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ def test_complex_series_frame_alignment(self, engine, parser):
10201020
parser=parser)
10211021
else:
10221022
res = pd.eval('df2 + s + df', engine=engine, parser=parser)
1023-
tm.assert_equal(res.shape, expected.shape)
1023+
assert res.shape == expected.shape
10241024
assert_frame_equal(res, expected)
10251025

10261026
def test_performance_warning_for_poor_alignment(self, engine, parser):
@@ -1057,13 +1057,13 @@ def test_performance_warning_for_poor_alignment(self, engine, parser):
10571057
pd.eval('df + s', engine=engine, parser=parser)
10581058

10591059
if not is_python_engine:
1060-
tm.assert_equal(len(w), 1)
1060+
assert len(w) == 1
10611061
msg = str(w[0].message)
10621062
expected = ("Alignment difference on axis {0} is larger"
10631063
" than an order of magnitude on term {1!r}, "
10641064
"by more than {2:.4g}; performance may suffer"
10651065
"".format(1, 'df', np.log10(s.size - df.shape[1])))
1066-
tm.assert_equal(msg, expected)
1066+
assert msg == expected
10671067

10681068

10691069
# ------------------------------------
@@ -1104,17 +1104,17 @@ def test_simple_arith_ops(self):
11041104
else:
11051105
expec = _eval_single_bin(1, op, 1, self.engine)
11061106
x = self.eval(ex, engine=self.engine, parser=self.parser)
1107-
tm.assert_equal(x, expec)
1107+
assert x == expec
11081108

11091109
expec = _eval_single_bin(x, op, 1, self.engine)
11101110
y = self.eval(ex2, local_dict={'x': x}, engine=self.engine,
11111111
parser=self.parser)
1112-
tm.assert_equal(y, expec)
1112+
assert y == expec
11131113

11141114
expec = _eval_single_bin(1, op, x + 1, self.engine)
11151115
y = self.eval(ex3, local_dict={'x': x},
11161116
engine=self.engine, parser=self.parser)
1117-
tm.assert_equal(y, expec)
1117+
assert y == expec
11181118

11191119
def test_simple_bool_ops(self):
11201120
for op, lhs, rhs in product(expr._bool_ops_syms, (True, False),
@@ -1149,7 +1149,7 @@ def test_4d_ndarray_fails(self):
11491149

11501150
def test_constant(self):
11511151
x = self.eval('1')
1152-
tm.assert_equal(x, 1)
1152+
assert x == 1
11531153

11541154
def test_single_variable(self):
11551155
df = DataFrame(randn(10, 2))
@@ -1508,7 +1508,7 @@ def test_check_many_exprs(self):
15081508
expr = ' * '.join('a' * 33)
15091509
expected = 1
15101510
res = pd.eval(expr, engine=self.engine, parser=self.parser)
1511-
tm.assert_equal(res, expected)
1511+
assert res == expected
15121512

15131513
def test_fails_and(self):
15141514
df = DataFrame(np.random.randn(5, 3))
@@ -1736,14 +1736,14 @@ def test_no_new_locals(self, engine, parser):
17361736
pd.eval('x + 1', local_dict=lcls, engine=engine, parser=parser)
17371737
lcls2 = locals().copy()
17381738
lcls2.pop('lcls')
1739-
tm.assert_equal(lcls, lcls2)
1739+
assert lcls == lcls2
17401740

17411741
def test_no_new_globals(self, engine, parser):
17421742
x = 1 # noqa
17431743
gbls = globals().copy()
17441744
pd.eval('x + 1', engine=engine, parser=parser)
17451745
gbls2 = globals().copy()
1746-
tm.assert_equal(gbls, gbls2)
1746+
assert gbls == gbls2
17471747

17481748

17491749
def test_invalid_engine():
@@ -1810,7 +1810,7 @@ def test_numexpr_builtin_raises(engine, parser):
18101810
pd.eval('sin + dotted_line', engine=engine, parser=parser)
18111811
else:
18121812
res = pd.eval('sin + dotted_line', engine=engine, parser=parser)
1813-
tm.assert_equal(res, sin + dotted_line)
1813+
assert res == sin + dotted_line
18141814

18151815

18161816
def test_bad_resolver_raises(engine, parser):
@@ -1854,7 +1854,7 @@ def test_inf(engine, parser):
18541854
s = 'inf + 1'
18551855
expected = np.inf
18561856
result = pd.eval(s, engine=engine, parser=parser)
1857-
tm.assert_equal(result, expected)
1857+
assert result == expected
18581858

18591859

18601860
def test_negate_lt_eq_le(engine, parser):

‎pandas/tests/core/sparse/test_frame.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,7 @@ def test_from_to_scipy(spmatrix, index, columns, fill_value, dtype):
11831183
tm.assert_frame_equal(sdf_obj.to_dense(), expected.to_dense())
11841184

11851185
# Assert spmatrices equal
1186-
tm.assert_equal(dict(sdf.to_coo().todok()), dict(spm.todok()))
1186+
assert dict(sdf.to_coo().todok()) == dict(spm.todok())
11871187

11881188
# Ensure dtype is preserved if possible
11891189
was_upcast = ((fill_value is None or is_float(fill_value)) and
@@ -1193,11 +1193,11 @@ def test_from_to_scipy(spmatrix, index, columns, fill_value, dtype):
11931193
float if was_upcast else
11941194
dtype)
11951195
tm.assert_contains_all(sdf.dtypes, {np.dtype(res_dtype)})
1196-
tm.assert_equal(sdf.to_coo().dtype, res_dtype)
1196+
assert sdf.to_coo().dtype == res_dtype
11971197

11981198
# However, adding a str column results in an upcast to object
11991199
sdf['strings'] = np.arange(len(sdf)).astype(str)
1200-
tm.assert_equal(sdf.to_coo().dtype, np.object_)
1200+
assert sdf.to_coo().dtype == np.object_
12011201

12021202

12031203
@pytest.mark.parametrize('fill_value', [None, 0, np.nan]) # noqa: F811
@@ -1237,12 +1237,12 @@ def test_from_to_scipy_object(spmatrix, fill_value):
12371237
tm.assert_frame_equal(sdf_obj.to_dense(), expected.to_dense())
12381238

12391239
# Assert spmatrices equal
1240-
tm.assert_equal(dict(sdf.to_coo().todok()), dict(spm.todok()))
1240+
assert dict(sdf.to_coo().todok()) == dict(spm.todok())
12411241

12421242
# Ensure dtype is preserved if possible
12431243
res_dtype = object
12441244
tm.assert_contains_all(sdf.dtypes, {np.dtype(res_dtype)})
1245-
tm.assert_equal(sdf.to_coo().dtype, res_dtype)
1245+
assert sdf.to_coo().dtype == res_dtype
12461246

12471247

12481248
class TestSparseDataFrameArithmetic(tm.TestCase):

‎pandas/tests/formats/test_format.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,11 +2536,11 @@ def test_nat_representations(self):
25362536
def test_format_percentiles():
25372537
result = fmt.format_percentiles([0.01999, 0.02001, 0.5, 0.666666, 0.9999])
25382538
expected = ['1.999%', '2.001%', '50%', '66.667%', '99.99%']
2539-
tm.assert_equal(result, expected)
2539+
assert result == expected
25402540

25412541
result = fmt.format_percentiles([0, 0.5, 0.02001, 0.5, 0.666666, 0.9999])
25422542
expected = ['0%', '50%', '2.0%', '50%', '66.67%', '99.99%']
2543-
tm.assert_equal(result, expected)
2543+
assert result == expected
25442544

25452545
tm.assertRaises(ValueError, fmt.format_percentiles, [0.1, np.nan, 0.5])
25462546
tm.assertRaises(ValueError, fmt.format_percentiles, [-0.001, 0.1, 0.5])

‎pandas/tests/formats/test_printing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ def test_repr_binary_type():
2727
raw = btype(letters)
2828
b = compat.text_type(compat.bytes_to_str(raw))
2929
res = printing.pprint_thing(b, quote_strings=True)
30-
tm.assert_equal(res, repr(b))
30+
assert res == repr(b)
3131
res = printing.pprint_thing(b, quote_strings=False)
32-
tm.assert_equal(res, b)
32+
assert res == b
3333

3434

3535
class TestFormattBase(tm.TestCase):

‎pandas/tests/frame/test_constructors.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,8 @@ def test_constructor_dict(self):
259259
# Dict with None value
260260
frame_none = DataFrame(dict(a=None), index=[0])
261261
frame_none_list = DataFrame(dict(a=[None]), index=[0])
262-
tm.assert_equal(frame_none.get_value(0, 'a'), None)
263-
tm.assert_equal(frame_none_list.get_value(0, 'a'), None)
262+
assert frame_none.get_value(0, 'a') is None
263+
assert frame_none_list.get_value(0, 'a') is None
264264
tm.assert_frame_equal(frame_none, frame_none_list)
265265

266266
# GH10856

‎pandas/tests/frame/test_replace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ def test_replace_period(self):
974974
'out_augmented_MAY_2011.json',
975975
'out_augmented_AUG_2011.json',
976976
'out_augmented_JAN_2011.json'], columns=['fname'])
977-
tm.assert_equal(set(df.fname.values), set(d['fname'].keys()))
977+
assert set(df.fname.values) == set(d['fname'].keys())
978978
expected = DataFrame({'fname': [d['fname'][k]
979979
for k in df.fname.values]})
980980
result = df.replace(d)
@@ -997,7 +997,7 @@ def test_replace_datetime(self):
997997
'out_augmented_MAY_2011.json',
998998
'out_augmented_AUG_2011.json',
999999
'out_augmented_JAN_2011.json'], columns=['fname'])
1000-
tm.assert_equal(set(df.fname.values), set(d['fname'].keys()))
1000+
assert set(df.fname.values) == set(d['fname'].keys())
10011001
expected = DataFrame({'fname': [d['fname'][k]
10021002
for k in df.fname.values]})
10031003
result = df.replace(d)

‎pandas/tests/frame/test_subclass.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ def test_subclass_sparse_slice(self):
229229
tm.SubclassedSparseDataFrame(rows[:2]))
230230
tm.assert_sp_frame_equal(ssdf[:2],
231231
tm.SubclassedSparseDataFrame(rows[:2]))
232-
tm.assert_equal(ssdf.loc[:2].testattr, "testattr")
233-
tm.assert_equal(ssdf.iloc[:2].testattr, "testattr")
234-
tm.assert_equal(ssdf[:2].testattr, "testattr")
232+
assert ssdf.loc[:2].testattr == "testattr"
233+
assert ssdf.iloc[:2].testattr == "testattr"
234+
assert ssdf[:2].testattr == "testattr"
235235

236236
tm.assert_sp_series_equal(ssdf.loc[1],
237237
tm.SubclassedSparseSeries(rows[1]),

‎pandas/tests/groupby/test_groupby.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3275,7 +3275,7 @@ def f(group):
32753275
# we expect 2 zeros because we call ``f`` once to see if a faster route
32763276
# can be used.
32773277
expected_names = [0, 0, 1, 2]
3278-
tm.assert_equal(names, expected_names)
3278+
assert names == expected_names
32793279

32803280
def test_no_dummy_key_names(self):
32813281
# GH #1291
@@ -3987,7 +3987,7 @@ def test_grouping_string_repr(self):
39873987

39883988
result = gr.grouper.groupings[0].__repr__()
39893989
expected = "Grouping(('A', 'a'))"
3990-
tm.assert_equal(result, expected)
3990+
assert result == expected
39913991

39923992
def test_group_shift_with_null_key(self):
39933993
# This test is designed to replicate the segfault in issue #13813.

‎pandas/tests/indexes/datetimes/test_tools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ def test_parsers_time(self):
12951295

12961296
res = tools.to_time(np.array(arg))
12971297
self.assertIsInstance(res, list)
1298-
self.assert_equal(res, expected_arr)
1298+
assert res == expected_arr
12991299

13001300
def test_parsers_monthfreq(self):
13011301
cases = {'201101': datetime(2011, 1, 1, 0, 0),

0 commit comments

Comments
 (0)