Skip to content

Commit 4adb98b

Browse files
jrebackjreback
committed
Merge pull request #6387 from bwignall/assert_6175_arrayequal_3
CLN: Specialize assert_(np.array_equal(...))
2 parents 4ebc5d1 + fbd6fcc commit 4adb98b

File tree

11 files changed

+99
-99
lines changed

11 files changed

+99
-99
lines changed

‎pandas/io/tests/test_cparser.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ def test_skipinitialspace(self):
8282
header=None)
8383
result = reader.read()
8484

85-
self.assert_(np.array_equal(result[0], ['a', 'a', 'a', 'a']))
86-
self.assert_(np.array_equal(result[1], ['b', 'b', 'b', 'b']))
85+
self.assert_numpy_array_equal(result[0], ['a', 'a', 'a', 'a'])
86+
self.assert_numpy_array_equal(result[1], ['b', 'b', 'b', 'b'])
8787

8888
def test_parse_booleans(self):
8989
data = 'True\nFalse\nTrue\nTrue'
@@ -100,8 +100,8 @@ def test_delimit_whitespace(self):
100100
header=None)
101101
result = reader.read()
102102

103-
self.assert_(np.array_equal(result[0], ['a', 'a', 'a']))
104-
self.assert_(np.array_equal(result[1], ['b', 'b', 'b']))
103+
self.assert_numpy_array_equal(result[0], ['a', 'a', 'a'])
104+
self.assert_numpy_array_equal(result[1], ['b', 'b', 'b'])
105105

106106
def test_embedded_newline(self):
107107
data = 'a\n"hello\nthere"\nthis'
@@ -110,7 +110,7 @@ def test_embedded_newline(self):
110110
result = reader.read()
111111

112112
expected = ['a', 'hello\nthere', 'this']
113-
self.assert_(np.array_equal(result[0], expected))
113+
self.assert_numpy_array_equal(result[0], expected)
114114

115115
def test_euro_decimal(self):
116116
data = '12345,67\n345,678'

‎pandas/io/tests/test_parsers.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -810,9 +810,9 @@ def test_unnamed_columns(self):
810810
[11, 12, 13, 14, 15]]
811811
df = self.read_table(StringIO(data), sep=',')
812812
tm.assert_almost_equal(df.values, expected)
813-
self.assert_(np.array_equal(df.columns,
814-
['A', 'B', 'C', 'Unnamed: 3',
815-
'Unnamed: 4']))
813+
self.assert_numpy_array_equal(df.columns,
814+
['A', 'B', 'C', 'Unnamed: 3',
815+
'Unnamed: 4'])
816816

817817
def test_string_nas(self):
818818
data = """A,B,C
@@ -963,11 +963,11 @@ def test_no_header(self):
963963
tm.assert_almost_equal(df.values, expected)
964964
tm.assert_almost_equal(df.values, df2.values)
965965

966-
self.assert_(np.array_equal(df_pref.columns,
967-
['X0', 'X1', 'X2', 'X3', 'X4']))
968-
self.assert_(np.array_equal(df.columns, lrange(5)))
966+
self.assert_numpy_array_equal(df_pref.columns,
967+
['X0', 'X1', 'X2', 'X3', 'X4'])
968+
self.assert_numpy_array_equal(df.columns, lrange(5))
969969

970-
self.assert_(np.array_equal(df2.columns, names))
970+
self.assert_numpy_array_equal(df2.columns, names)
971971

972972
def test_no_header_prefix(self):
973973
data = """1,2,3,4,5
@@ -982,8 +982,8 @@ def test_no_header_prefix(self):
982982
[11, 12, 13, 14, 15]]
983983
tm.assert_almost_equal(df_pref.values, expected)
984984

985-
self.assert_(np.array_equal(df_pref.columns,
986-
['Field0', 'Field1', 'Field2', 'Field3', 'Field4']))
985+
self.assert_numpy_array_equal(df_pref.columns,
986+
['Field0', 'Field1', 'Field2', 'Field3', 'Field4'])
987987

988988
def test_header_with_index_col(self):
989989
data = """foo,1,2,3
@@ -1004,7 +1004,7 @@ def test_read_csv_dataframe(self):
10041004
df = self.read_csv(self.csv1, index_col=0, parse_dates=True)
10051005
df2 = self.read_table(self.csv1, sep=',', index_col=0,
10061006
parse_dates=True)
1007-
self.assert_(np.array_equal(df.columns, ['A', 'B', 'C', 'D']))
1007+
self.assert_numpy_array_equal(df.columns, ['A', 'B', 'C', 'D'])
10081008
self.assertEqual(df.index.name, 'index')
10091009
self.assert_(isinstance(df.index[0], (datetime, np.datetime64,
10101010
Timestamp)))
@@ -1015,7 +1015,7 @@ def test_read_csv_no_index_name(self):
10151015
df = self.read_csv(self.csv2, index_col=0, parse_dates=True)
10161016
df2 = self.read_table(self.csv2, sep=',', index_col=0,
10171017
parse_dates=True)
1018-
self.assert_(np.array_equal(df.columns, ['A', 'B', 'C', 'D', 'E']))
1018+
self.assert_numpy_array_equal(df.columns, ['A', 'B', 'C', 'D', 'E'])
10191019
self.assert_(isinstance(df.index[0], (datetime, np.datetime64,
10201020
Timestamp)))
10211021
self.assertEqual(df.ix[:, ['A', 'B', 'C', 'D']].values.dtype, np.float64)

‎pandas/sparse/tests/test_sparse.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,8 +1099,8 @@ def test_set_value(self):
10991099

11001100
res2 = res.set_value('foobar', 'qux', 1.5)
11011101
self.assert_(res2 is not res)
1102-
self.assert_(np.array_equal(res2.columns,
1103-
list(self.frame.columns) + ['qux']))
1102+
self.assert_numpy_array_equal(res2.columns,
1103+
list(self.frame.columns) + ['qux'])
11041104
self.assertEqual(res2.get_value('foobar', 'qux'), 1.5)
11051105

11061106
def test_fancy_index_misc(self):
@@ -1126,7 +1126,7 @@ def test_getitem_overload(self):
11261126
subindex = self.frame.index[indexer]
11271127
subframe = self.frame[indexer]
11281128

1129-
self.assert_(np.array_equal(subindex, subframe.index))
1129+
self.assert_numpy_array_equal(subindex, subframe.index)
11301130
self.assertRaises(Exception, self.frame.__getitem__, indexer[:-1])
11311131

11321132
def test_setitem(self):
@@ -1413,8 +1413,8 @@ def _check(frame):
14131413

14141414
from_sparse_lp = spf.stack_sparse_frame(frame)
14151415

1416-
self.assert_(np.array_equal(from_dense_lp.values,
1417-
from_sparse_lp.values))
1416+
self.assert_numpy_array_equal(from_dense_lp.values,
1417+
from_sparse_lp.values)
14181418

14191419
_check(self.frame)
14201420
_check(self.iframe)
@@ -1624,7 +1624,7 @@ def _compare_with_dense(panel):
16241624
slp = panel.to_frame()
16251625
dlp = panel.to_dense().to_frame()
16261626

1627-
self.assert_(np.array_equal(slp.values, dlp.values))
1627+
self.assert_numpy_array_equal(slp.values, dlp.values)
16281628
self.assert_(slp.index.equals(dlp.index))
16291629

16301630
_compare_with_dense(self.panel)

‎pandas/stats/tests/test_ols.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ def testFilterWithDictRHS(self):
881881
self.tsAssertEqual(exp_rhs2, rhs['x2'])
882882

883883
def tsAssertEqual(self, ts1, ts2):
884-
self.assert_(np.array_equal(ts1, ts2))
884+
self.assert_numpy_array_equal(ts1, ts2)
885885

886886

887887
if __name__ == '__main__':

‎pandas/tools/tests/test_merge.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def test_cython_left_outer_join(self):
9090
exp_rs = exp_rs.take(exp_ri)
9191
exp_rs[exp_ri == -1] = -1
9292

93-
self.assert_(np.array_equal(ls, exp_ls))
94-
self.assert_(np.array_equal(rs, exp_rs))
93+
self.assert_numpy_array_equal(ls, exp_ls)
94+
self.assert_numpy_array_equal(rs, exp_rs)
9595

9696
def test_cython_right_outer_join(self):
9797
left = a_([0, 1, 2, 1, 2, 0, 0, 1, 2, 3, 3], dtype=np.int64)
@@ -116,8 +116,8 @@ def test_cython_right_outer_join(self):
116116
exp_rs = exp_rs.take(exp_ri)
117117
exp_rs[exp_ri == -1] = -1
118118

119-
self.assert_(np.array_equal(ls, exp_ls))
120-
self.assert_(np.array_equal(rs, exp_rs))
119+
self.assert_numpy_array_equal(ls, exp_ls)
120+
self.assert_numpy_array_equal(rs, exp_rs)
121121

122122
def test_cython_inner_join(self):
123123
left = a_([0, 1, 2, 1, 2, 0, 0, 1, 2, 3, 3], dtype=np.int64)
@@ -140,8 +140,8 @@ def test_cython_inner_join(self):
140140
exp_rs = exp_rs.take(exp_ri)
141141
exp_rs[exp_ri == -1] = -1
142142

143-
self.assert_(np.array_equal(ls, exp_ls))
144-
self.assert_(np.array_equal(rs, exp_rs))
143+
self.assert_numpy_array_equal(ls, exp_ls)
144+
self.assert_numpy_array_equal(rs, exp_rs)
145145

146146
def test_left_outer_join(self):
147147
joined_key2 = merge(self.df, self.df2, on='key2')
@@ -199,8 +199,8 @@ def test_join_on(self):
199199
source = self.source
200200

201201
merged = target.join(source, on='C')
202-
self.assert_(np.array_equal(merged['MergedA'], target['A']))
203-
self.assert_(np.array_equal(merged['MergedD'], target['D']))
202+
self.assert_numpy_array_equal(merged['MergedA'], target['A'])
203+
self.assert_numpy_array_equal(merged['MergedD'], target['D'])
204204

205205
# join with duplicates (fix regression from DataFrame/Matrix merge)
206206
df = DataFrame({'key': ['a', 'a', 'b', 'b', 'c']})
@@ -285,8 +285,8 @@ def test_join_on_inner(self):
285285

286286
expected = df.join(df2, on='key')
287287
expected = expected[expected['value'].notnull()]
288-
self.assert_(np.array_equal(joined['key'], expected['key']))
289-
self.assert_(np.array_equal(joined['value'], expected['value']))
288+
self.assert_numpy_array_equal(joined['key'], expected['key'])
289+
self.assert_numpy_array_equal(joined['value'], expected['value'])
290290
self.assert_(joined.index.equals(expected.index))
291291

292292
def test_join_on_singlekey_list(self):
@@ -612,7 +612,7 @@ def test_join_sort(self):
612612

613613
# smoke test
614614
joined = left.join(right, on='key', sort=False)
615-
self.assert_(np.array_equal(joined.index, lrange(4)))
615+
self.assert_numpy_array_equal(joined.index, lrange(4))
616616

617617
def test_intelligently_handle_join_key(self):
618618
# #733, be a bit more 1337 about not returning unconsolidated DataFrame
@@ -651,15 +651,15 @@ def test_handle_join_key_pass_array(self):
651651
rkey = np.array([1, 1, 2, 3, 4, 5])
652652

653653
merged = merge(left, right, left_on=lkey, right_on=rkey, how='outer')
654-
self.assert_(np.array_equal(merged['key_0'],
655-
np.array([1, 1, 1, 1, 2, 2, 3, 4, 5])))
654+
self.assert_numpy_array_equal(merged['key_0'],
655+
np.array([1, 1, 1, 1, 2, 2, 3, 4, 5]))
656656

657657
left = DataFrame({'value': lrange(3)})
658658
right = DataFrame({'rvalue': lrange(6)})
659659

660660
key = np.array([0, 1, 1, 2, 2, 3])
661661
merged = merge(left, right, left_index=True, right_on=key, how='outer')
662-
self.assert_(np.array_equal(merged['key_0'], key))
662+
self.assert_numpy_array_equal(merged['key_0'], key)
663663

664664
def test_mixed_type_join_with_suffix(self):
665665
# GH #916
@@ -1414,7 +1414,7 @@ def test_concat_keys_specific_levels(self):
14141414
levels=[level],
14151415
names=['group_key'])
14161416

1417-
self.assert_(np.array_equal(result.columns.levels[0], level))
1417+
self.assert_numpy_array_equal(result.columns.levels[0], level)
14181418
self.assertEqual(result.columns.names[0], 'group_key')
14191419

14201420
def test_concat_dataframe_keys_bug(self):
@@ -1518,7 +1518,7 @@ def test_concat_keys_and_levels(self):
15181518
('baz', 'one'), ('baz', 'two')],
15191519
names=['first', 'second'])
15201520
self.assertEqual(result.index.names, ('first', 'second') + (None,))
1521-
self.assert_(np.array_equal(result.index.levels[0], ['baz', 'foo']))
1521+
self.assert_numpy_array_equal(result.index.levels[0], ['baz', 'foo'])
15221522

15231523
def test_concat_keys_levels_no_overlap(self):
15241524
# GH #1406

‎pandas/tools/tests/test_tile.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ def test_labels(self):
7676
result, bins = cut(arr, 4, retbins=True)
7777
ex_levels = ['(-0.001, 0.25]', '(0.25, 0.5]', '(0.5, 0.75]',
7878
'(0.75, 1]']
79-
self.assert_(np.array_equal(result.levels, ex_levels))
79+
self.assert_numpy_array_equal(result.levels, ex_levels)
8080

8181
result, bins = cut(arr, 4, retbins=True, right=False)
8282
ex_levels = ['[0, 0.25)', '[0.25, 0.5)', '[0.5, 0.75)',
8383
'[0.75, 1.001)']
84-
self.assert_(np.array_equal(result.levels, ex_levels))
84+
self.assert_numpy_array_equal(result.levels, ex_levels)
8585

8686
def test_cut_pass_series_name_to_factor(self):
8787
s = Series(np.random.randn(100), name='foo')
@@ -95,7 +95,7 @@ def test_label_precision(self):
9595
result = cut(arr, 4, precision=2)
9696
ex_levels = ['(-0.00072, 0.18]', '(0.18, 0.36]', '(0.36, 0.54]',
9797
'(0.54, 0.72]']
98-
self.assert_(np.array_equal(result.levels, ex_levels))
98+
self.assert_numpy_array_equal(result.levels, ex_levels)
9999

100100
def test_na_handling(self):
101101
arr = np.arange(0, 0.75, 0.01)
@@ -137,7 +137,7 @@ def test_qcut(self):
137137
assert_almost_equal(bins, ex_bins)
138138

139139
ex_levels = cut(arr, ex_bins, include_lowest=True)
140-
self.assert_(np.array_equal(labels, ex_levels))
140+
self.assert_numpy_array_equal(labels, ex_levels)
141141

142142
def test_qcut_bounds(self):
143143
arr = np.random.randn(1000)
@@ -162,7 +162,7 @@ def test_cut_out_of_bounds(self):
162162

163163
mask = result.labels == -1
164164
ex_mask = (arr < -1) | (arr > 1)
165-
self.assert_(np.array_equal(mask, ex_mask))
165+
self.assert_numpy_array_equal(mask, ex_mask)
166166

167167
def test_cut_pass_labels(self):
168168
arr = [50, 5, 10, 15, 20, 30, 70]

‎pandas/tseries/tests/test_daterange.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ class TestGenRangeGeneration(tm.TestCase):
4242
def test_generate(self):
4343
rng1 = list(generate_range(START, END, offset=datetools.bday))
4444
rng2 = list(generate_range(START, END, time_rule='B'))
45-
self.assert_(np.array_equal(rng1, rng2))
45+
self.assert_numpy_array_equal(rng1, rng2)
4646

4747
def test_generate_cday(self):
4848
_skip_if_no_cday()
4949
rng1 = list(generate_range(START, END, offset=datetools.cday))
5050
rng2 = list(generate_range(START, END, time_rule='C'))
51-
self.assert_(np.array_equal(rng1, rng2))
51+
self.assert_numpy_array_equal(rng1, rng2)
5252

5353
def test_1(self):
5454
eq_gen_range(dict(start=datetime(2009, 3, 25), periods=2),
@@ -139,7 +139,7 @@ def test_repr(self):
139139

140140
def test_getitem(self):
141141
smaller = self.rng[:5]
142-
self.assert_(np.array_equal(smaller, self.rng.view(np.ndarray)[:5]))
142+
self.assert_numpy_array_equal(smaller, self.rng.view(np.ndarray)[:5])
143143
self.assertEquals(smaller.offset, self.rng.offset)
144144

145145
sliced = self.rng[::5]
@@ -156,7 +156,7 @@ def test_getitem(self):
156156
def test_getitem_matplotlib_hackaround(self):
157157
values = self.rng[:, None]
158158
expected = self.rng.values[:, None]
159-
self.assert_(np.array_equal(values, expected))
159+
self.assert_numpy_array_equal(values, expected)
160160

161161
def test_shift(self):
162162
shifted = self.rng.shift(5)
@@ -204,7 +204,7 @@ def test_union(self):
204204
tm.assert_isinstance(the_union, DatetimeIndex)
205205

206206
# order does not matter
207-
self.assert_(np.array_equal(right.union(left), the_union))
207+
self.assert_numpy_array_equal(right.union(left), the_union)
208208

209209
# overlapping, but different offset
210210
rng = date_range(START, END, freq=datetools.bmonthEnd)
@@ -352,7 +352,7 @@ def test_range_bug(self):
352352

353353
start = datetime(2011, 1, 1)
354354
exp_values = [start + i * offset for i in range(5)]
355-
self.assert_(np.array_equal(result, DatetimeIndex(exp_values)))
355+
self.assert_numpy_array_equal(result, DatetimeIndex(exp_values))
356356

357357
def test_range_tz(self):
358358
# GH 2906
@@ -459,7 +459,7 @@ def test_repr(self):
459459

460460
def test_getitem(self):
461461
smaller = self.rng[:5]
462-
self.assert_(np.array_equal(smaller, self.rng.view(np.ndarray)[:5]))
462+
self.assert_numpy_array_equal(smaller, self.rng.view(np.ndarray)[:5])
463463
self.assertEquals(smaller.offset, self.rng.offset)
464464

465465
sliced = self.rng[::5]
@@ -476,7 +476,7 @@ def test_getitem(self):
476476
def test_getitem_matplotlib_hackaround(self):
477477
values = self.rng[:, None]
478478
expected = self.rng.values[:, None]
479-
self.assert_(np.array_equal(values, expected))
479+
self.assert_numpy_array_equal(values, expected)
480480

481481
def test_shift(self):
482482
shifted = self.rng.shift(5)
@@ -524,7 +524,7 @@ def test_union(self):
524524
tm.assert_isinstance(the_union, DatetimeIndex)
525525

526526
# order does not matter
527-
self.assert_(np.array_equal(right.union(left), the_union))
527+
self.assert_numpy_array_equal(right.union(left), the_union)
528528

529529
# overlapping, but different offset
530530
rng = date_range(START, END, freq=datetools.bmonthEnd)

‎pandas/tseries/tests/test_period.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ def test_astype(self):
10881088
idx = period_range('1990', '2009', freq='A')
10891089

10901090
result = idx.astype('i8')
1091-
self.assert_(np.array_equal(result, idx.values))
1091+
self.assert_numpy_array_equal(result, idx.values)
10921092

10931093
def test_constructor_use_start_freq(self):
10941094
# GH #1118
@@ -1140,8 +1140,8 @@ def test_constructor_arrays_negative_year(self):
11401140

11411141
pindex = PeriodIndex(year=years, quarter=quarters)
11421142

1143-
self.assert_(np.array_equal(pindex.year, years))
1144-
self.assert_(np.array_equal(pindex.quarter, quarters))
1143+
self.assert_numpy_array_equal(pindex.year, years)
1144+
self.assert_numpy_array_equal(pindex.quarter, quarters)
11451145

11461146
def test_constructor_invalid_quarters(self):
11471147
self.assertRaises(ValueError, PeriodIndex, year=lrange(2000, 2004),
@@ -1210,7 +1210,7 @@ def test_comp_period(self):
12101210

12111211
result = idx < idx[10]
12121212
exp = idx.values < idx.values[10]
1213-
self.assert_(np.array_equal(result, exp))
1213+
self.assert_numpy_array_equal(result, exp)
12141214

12151215
def test_getitem_ndim2(self):
12161216
idx = period_range('2007-01', periods=3, freq='M')
@@ -2215,7 +2215,7 @@ def test_nanosecondly(self):
22152215
def _check_freq(self, freq, base_date):
22162216
rng = PeriodIndex(start=base_date, periods=10, freq=freq)
22172217
exp = np.arange(10, dtype=np.int64)
2218-
self.assert_(np.array_equal(rng.values, exp))
2218+
self.assert_numpy_array_equal(rng.values, exp)
22192219

22202220
def test_negone_ordinals(self):
22212221
freqs = ['A', 'M', 'Q', 'D', 'H', 'T', 'S']

0 commit comments

Comments
 (0)