Skip to content

Commit c5b4ada

Browse files
committed
MAINT: Remove np.array_equal calls in tests
1 parent c65a0f5 commit c5b4ada

13 files changed

+43
-41
lines changed

pandas/tests/dtypes/test_cast.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ def test_downcast_conv(self):
3838

3939
arr = np.array([8.5, 8.6, 8.7, 8.8, 8.9999999999995])
4040
result = maybe_downcast_to_dtype(arr, 'infer')
41-
assert (np.array_equal(result, arr))
41+
tm.assert_numpy_array_equal(result, arr)
4242

4343
arr = np.array([8., 8., 8., 8., 8.9999999999995])
4444
result = maybe_downcast_to_dtype(arr, 'infer')
4545
expected = np.array([8, 8, 8, 8, 9])
46-
assert (np.array_equal(result, expected))
46+
tm.assert_numpy_array_equal(result, expected)
4747

4848
arr = np.array([8., 8., 8., 8., 9.0000000000005])
4949
result = maybe_downcast_to_dtype(arr, 'infer')
5050
expected = np.array([8, 8, 8, 8, 9])
51-
assert (np.array_equal(result, expected))
51+
tm.assert_numpy_array_equal(result, expected)
5252

5353
# GH16875 coercing of bools
5454
ser = Series([True, True, False])

pandas/tests/frame/test_constructors.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1913,10 +1913,11 @@ def test_from_records_len0_with_columns(self):
19131913
# #2633
19141914
result = DataFrame.from_records([], index='foo',
19151915
columns=['foo', 'bar'])
1916+
expected = Index(['bar'])
19161917

1917-
assert np.array_equal(result.columns, ['bar'])
19181918
assert len(result) == 0
19191919
assert result.index.name == 'foo'
1920+
tm.assert_index_equal(result.columns, expected)
19201921

19211922
def test_to_frame_with_falsey_names(self):
19221923
# GH 16114

pandas/tests/frame/test_nonunique_indexes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ def test_as_matrix_duplicates(self):
448448
expected = np.array([[1, 2, 'a', 'b'], [1, 2, 'a', 'b']],
449449
dtype=object)
450450

451-
assert np.array_equal(result, expected)
451+
tm.assert_numpy_array_equal(result, expected)
452452

453453
def test_set_value_by_index(self):
454454
# See gh-12344

pandas/tests/indexes/datetimes/test_date_range.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222

2323
def eq_gen_range(kwargs, expected):
2424
rng = generate_range(**kwargs)
25-
assert (np.array_equal(list(rng), expected))
25+
result = np.asarray(list(rng))
26+
expected = np.asarray(expected)
27+
28+
tm.assert_numpy_array_equal(result, expected)
2629

2730

2831
class TestDateRanges(TestData):

pandas/tests/io/parser/common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ def test_parse_integers_above_fp_precision(self):
823823
17007000002000192,
824824
17007000002000194]})
825825

826-
assert np.array_equal(result['Numbers'], expected['Numbers'])
826+
tm.assert_series_equal(result['Numbers'], expected['Numbers'])
827827

828828
def test_chunks_have_consistent_numerical_type(self):
829829
integers = [str(i) for i in range(499999)]

pandas/tests/io/parser/test_textreader.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ def test_skip_bad_lines(self):
161161
error_bad_lines=False,
162162
warn_bad_lines=False)
163163
result = reader.read()
164-
expected = {0: ['a', 'd', 'g', 'l'],
165-
1: ['b', 'e', 'h', 'm'],
166-
2: ['c', 'f', 'i', 'n']}
164+
expected = {0: np.array(['a', 'd', 'g', 'l'], dtype=object),
165+
1: np.array(['b', 'e', 'h', 'm'], dtype=object),
166+
2: np.array(['c', 'f', 'i', 'n'], dtype=object)}
167167
assert_array_dicts_equal(result, expected)
168168

169169
reader = TextReader(StringIO(data), delimiter=':',
@@ -225,7 +225,7 @@ def test_escapechar(self):
225225
reader = TextReader(StringIO(data), delimiter=',', header=None,
226226
escapechar='\\')
227227
result = reader.read()
228-
expected = {0: ['"hello world"'] * 3}
228+
expected = {0: np.array(['"hello world"'] * 3, dtype=object)}
229229
assert_array_dicts_equal(result, expected)
230230

231231
def test_eof_has_eol(self):
@@ -397,4 +397,5 @@ def test_empty_csv_input(self):
397397

398398
def assert_array_dicts_equal(left, right):
399399
for k, v in compat.iteritems(left):
400-
assert(np.array_equal(v, right[k]))
400+
assert tm.assert_numpy_array_equal(np.asarray(v),
401+
np.asarray(right[k]))

pandas/tests/reshape/test_concat.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,9 @@ def test_concat_series_axis1_same_names_ignore_index(self):
15941594
s2 = Series(randn(len(dates)), index=dates, name='value')
15951595

15961596
result = concat([s1, s2], axis=1, ignore_index=True)
1597-
assert np.array_equal(result.columns, [0, 1])
1597+
expected = Index([0, 1])
1598+
1599+
tm.assert_index_equal(result.columns, expected)
15981600

15991601
def test_concat_iterables(self):
16001602
from collections import deque, Iterable

pandas/tests/series/test_missing.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -636,17 +636,21 @@ def test_valid(self):
636636

637637
def test_isna(self):
638638
ser = Series([0, 5.4, 3, nan, -0.001])
639-
np.array_equal(ser.isna(),
640-
Series([False, False, False, True, False]).values)
639+
expected = Series([False, False, False, True, False])
640+
tm.assert_series_equal(ser.isna(), expected)
641+
641642
ser = Series(["hi", "", nan])
642-
np.array_equal(ser.isna(), Series([False, False, True]).values)
643+
expected = Series([False, False, True])
644+
tm.assert_series_equal(ser.isna(), expected)
643645

644646
def test_notna(self):
645647
ser = Series([0, 5.4, 3, nan, -0.001])
646-
np.array_equal(ser.notna(),
647-
Series([True, True, True, False, True]).values)
648+
expected = Series([True, True, True, False, True])
649+
tm.assert_series_equal(ser.notna(), expected)
650+
648651
ser = Series(["hi", "", nan])
649-
np.array_equal(ser.notna(), Series([True, True, False]).values)
652+
expected = Series([True, True, False])
653+
tm.assert_series_equal(ser.notna(), expected)
650654

651655
def test_pad_nan(self):
652656
x = Series([np.nan, 1., np.nan, 3., np.nan], ['z', 'a', 'b', 'c', 'd'],

pandas/tests/test_algos.py

+6-15
Original file line numberDiff line numberDiff line change
@@ -1132,19 +1132,19 @@ def test_pad_backfill_object_segfault():
11321132

11331133
result = libalgos.pad_object(old, new)
11341134
expected = np.array([-1], dtype=np.int64)
1135-
assert (np.array_equal(result, expected))
1135+
tm.assert_numpy_array_equal(result, expected)
11361136

11371137
result = libalgos.pad_object(new, old)
11381138
expected = np.array([], dtype=np.int64)
1139-
assert (np.array_equal(result, expected))
1139+
tm.assert_numpy_array_equal(result, expected)
11401140

11411141
result = libalgos.backfill_object(old, new)
11421142
expected = np.array([-1], dtype=np.int64)
1143-
assert (np.array_equal(result, expected))
1143+
tm.assert_numpy_array_equal(result, expected)
11441144

11451145
result = libalgos.backfill_object(new, old)
11461146
expected = np.array([], dtype=np.int64)
1147-
assert (np.array_equal(result, expected))
1147+
tm.assert_numpy_array_equal(result, expected)
11481148

11491149

11501150
def test_arrmap():
@@ -1235,15 +1235,6 @@ def test_is_lexsorted():
12351235

12361236
assert (not libalgos.is_lexsorted(failure))
12371237

1238-
# def test_get_group_index():
1239-
# a = np.array([0, 1, 2, 0, 2, 1, 0, 0], dtype=np.int64)
1240-
# b = np.array([1, 0, 3, 2, 0, 2, 3, 0], dtype=np.int64)
1241-
# expected = np.array([1, 4, 11, 2, 8, 6, 3, 0], dtype=np.int64)
1242-
1243-
# result = lib.get_group_index([a, b], (3, 4))
1244-
1245-
# assert(np.array_equal(result, expected))
1246-
12471238

12481239
def test_groupsort_indexer():
12491240
a = np.random.randint(0, 1000, 100).astype(np.int64)
@@ -1253,13 +1244,13 @@ def test_groupsort_indexer():
12531244

12541245
# need to use a stable sort
12551246
expected = np.argsort(a, kind='mergesort')
1256-
assert (np.array_equal(result, expected))
1247+
tm.assert_numpy_array_equal(result, expected)
12571248

12581249
# compare with lexsort
12591250
key = a * 1000 + b
12601251
result = libalgos.groupsort_indexer(key, 1000000)[0]
12611252
expected = np.lexsort((b, a))
1262-
assert (np.array_equal(result, expected))
1253+
tm.assert_numpy_array_equal(result, expected)
12631254

12641255

12651256
def test_infinity_sort():

pandas/tests/test_join.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def test_left_join_indexer_unique():
5353

5454
result = _join.left_join_indexer_unique_int64(b, a)
5555
expected = np.array([1, 1, 2, 3, 3], dtype=np.int64)
56-
assert (np.array_equal(result, expected))
56+
tm.assert_numpy_array_equal(result, expected)
5757

5858

5959
def test_left_outer_join_bug():
@@ -74,8 +74,8 @@ def test_left_outer_join_bug():
7474
exp_ridx[left == 1] = 1
7575
exp_ridx[left == 3] = 0
7676

77-
assert (np.array_equal(lidx, exp_lidx))
78-
assert (np.array_equal(ridx, exp_ridx))
77+
tm.assert_numpy_array_equal(lidx, exp_lidx)
78+
tm.assert_numpy_array_equal(ridx, exp_ridx)
7979

8080

8181
def test_inner_join_indexer():

pandas/tests/test_lib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ def test_get_reverse_indexer(self):
198198
indexer = np.array([-1, -1, 1, 2, 0, -1, 3, 4], dtype=np.int64)
199199
result = lib.get_reverse_indexer(indexer, 5)
200200
expected = np.array([4, 2, 3, 6, 7], dtype=np.int64)
201-
assert np.array_equal(result, expected)
201+
tm.assert_numpy_array_equal(result, expected)
202202

203203

204204
class TestNAObj(object):

pandas/tests/test_sorting.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ def testit(label_list, shape):
332332
label_list2 = decons_group_index(group_index, shape)
333333

334334
for a, b in zip(label_list, label_list2):
335-
assert (np.array_equal(a, b))
335+
tm.assert_numpy_array_equal(a, b)
336336

337337
shape = (4, 5, 6)
338338
label_list = [np.tile([0, 1, 2, 3, 0, 1, 2, 3], 100), np.tile(

pandas/tests/tseries/test_timezones.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def test_utc_to_local_no_modify(self):
7070
rng_eastern = rng.tz_convert(self.tzstr('US/Eastern'))
7171

7272
# Values are unmodified
73-
assert np.array_equal(rng.asi8, rng_eastern.asi8)
73+
tm.assert_numpy_array_equal(rng.asi8, rng_eastern.asi8)
7474

7575
assert self.cmptz(rng_eastern.tz, self.tz('US/Eastern'))
7676

@@ -108,7 +108,7 @@ def test_localize_utc_conversion_explicit(self):
108108
rng = date_range('3/10/2012', '3/11/2012', freq='30T')
109109
converted = rng.tz_localize(self.tz('US/Eastern'))
110110
expected_naive = rng + offsets.Hour(5)
111-
assert np.array_equal(converted.asi8, expected_naive.asi8)
111+
tm.assert_numpy_array_equal(converted.asi8, expected_naive.asi8)
112112

113113
# DST ambiguity, this should fail
114114
rng = date_range('3/11/2012', '3/12/2012', freq='30T')

0 commit comments

Comments
 (0)