Skip to content

Commit 064f57f

Browse files
gfyoungjreback
gfyoung
authored and
jreback
committed
MAINT: Remove self.assert_* from testing (pandas-dev#16076)
* MAINT: Remove self.assert_almost_equal from testing * MAINT: Remove self.assert_index_equal from testing * MAINT: Remove self.assert_categorical_equal from testing * MAINT: Remove self.assert_numpy_array_equal from testing * MAINT: Remove self.assert_series_equal from testing * MAINT: Remove self.assert_frame_equal from testing * MAINT: Remove self.assert_produces_warning from testing
1 parent 420baad commit 064f57f

File tree

107 files changed

+1521
-1523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1521
-1523
lines changed

‎pandas/tests/dtypes/test_io.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -13,64 +13,64 @@ def test_convert_sql_column_floats(self):
1313
arr = np.array([1.5, None, 3, 4.2], dtype=object)
1414
result = lib.convert_sql_column(arr)
1515
expected = np.array([1.5, np.nan, 3, 4.2], dtype='f8')
16-
self.assert_numpy_array_equal(result, expected)
16+
tm.assert_numpy_array_equal(result, expected)
1717

1818
def test_convert_sql_column_strings(self):
1919
arr = np.array(['1.5', None, '3', '4.2'], dtype=object)
2020
result = lib.convert_sql_column(arr)
2121
expected = np.array(['1.5', np.nan, '3', '4.2'], dtype=object)
22-
self.assert_numpy_array_equal(result, expected)
22+
tm.assert_numpy_array_equal(result, expected)
2323

2424
def test_convert_sql_column_unicode(self):
2525
arr = np.array([u('1.5'), None, u('3'), u('4.2')],
2626
dtype=object)
2727
result = lib.convert_sql_column(arr)
2828
expected = np.array([u('1.5'), np.nan, u('3'), u('4.2')],
2929
dtype=object)
30-
self.assert_numpy_array_equal(result, expected)
30+
tm.assert_numpy_array_equal(result, expected)
3131

3232
def test_convert_sql_column_ints(self):
3333
arr = np.array([1, 2, 3, 4], dtype='O')
3434
arr2 = np.array([1, 2, 3, 4], dtype='i4').astype('O')
3535
result = lib.convert_sql_column(arr)
3636
result2 = lib.convert_sql_column(arr2)
3737
expected = np.array([1, 2, 3, 4], dtype='i8')
38-
self.assert_numpy_array_equal(result, expected)
39-
self.assert_numpy_array_equal(result2, expected)
38+
tm.assert_numpy_array_equal(result, expected)
39+
tm.assert_numpy_array_equal(result2, expected)
4040

4141
arr = np.array([1, 2, 3, None, 4], dtype='O')
4242
result = lib.convert_sql_column(arr)
4343
expected = np.array([1, 2, 3, np.nan, 4], dtype='f8')
44-
self.assert_numpy_array_equal(result, expected)
44+
tm.assert_numpy_array_equal(result, expected)
4545

4646
def test_convert_sql_column_longs(self):
4747
arr = np.array([long(1), long(2), long(3), long(4)], dtype='O')
4848
result = lib.convert_sql_column(arr)
4949
expected = np.array([1, 2, 3, 4], dtype='i8')
50-
self.assert_numpy_array_equal(result, expected)
50+
tm.assert_numpy_array_equal(result, expected)
5151

5252
arr = np.array([long(1), long(2), long(3), None, long(4)], dtype='O')
5353
result = lib.convert_sql_column(arr)
5454
expected = np.array([1, 2, 3, np.nan, 4], dtype='f8')
55-
self.assert_numpy_array_equal(result, expected)
55+
tm.assert_numpy_array_equal(result, expected)
5656

5757
def test_convert_sql_column_bools(self):
5858
arr = np.array([True, False, True, False], dtype='O')
5959
result = lib.convert_sql_column(arr)
6060
expected = np.array([True, False, True, False], dtype=bool)
61-
self.assert_numpy_array_equal(result, expected)
61+
tm.assert_numpy_array_equal(result, expected)
6262

6363
arr = np.array([True, False, None, False], dtype='O')
6464
result = lib.convert_sql_column(arr)
6565
expected = np.array([True, False, np.nan, False], dtype=object)
66-
self.assert_numpy_array_equal(result, expected)
66+
tm.assert_numpy_array_equal(result, expected)
6767

6868
def test_convert_sql_column_decimals(self):
6969
from decimal import Decimal
7070
arr = np.array([Decimal('1.5'), None, Decimal('3'), Decimal('4.2')])
7171
result = lib.convert_sql_column(arr)
7272
expected = np.array([1.5, np.nan, 3, 4.2], dtype='f8')
73-
self.assert_numpy_array_equal(result, expected)
73+
tm.assert_numpy_array_equal(result, expected)
7474

7575
def test_convert_downcast_int64(self):
7676
from pandas.io.libparsers import na_values
@@ -80,30 +80,30 @@ def test_convert_downcast_int64(self):
8080

8181
# default argument
8282
result = lib.downcast_int64(arr, na_values)
83-
self.assert_numpy_array_equal(result, expected)
83+
tm.assert_numpy_array_equal(result, expected)
8484

8585
result = lib.downcast_int64(arr, na_values, use_unsigned=False)
86-
self.assert_numpy_array_equal(result, expected)
86+
tm.assert_numpy_array_equal(result, expected)
8787

8888
expected = np.array([1, 2, 7, 8, 10], dtype=np.uint8)
8989
result = lib.downcast_int64(arr, na_values, use_unsigned=True)
90-
self.assert_numpy_array_equal(result, expected)
90+
tm.assert_numpy_array_equal(result, expected)
9191

9292
# still cast to int8 despite use_unsigned=True
9393
# because of the negative number as an element
9494
arr = np.array([1, 2, -7, 8, 10], dtype=np.int64)
9595
expected = np.array([1, 2, -7, 8, 10], dtype=np.int8)
9696
result = lib.downcast_int64(arr, na_values, use_unsigned=True)
97-
self.assert_numpy_array_equal(result, expected)
97+
tm.assert_numpy_array_equal(result, expected)
9898

9999
arr = np.array([1, 2, 7, 8, 300], dtype=np.int64)
100100
expected = np.array([1, 2, 7, 8, 300], dtype=np.int16)
101101
result = lib.downcast_int64(arr, na_values)
102-
self.assert_numpy_array_equal(result, expected)
102+
tm.assert_numpy_array_equal(result, expected)
103103

104104
int8_na = na_values[np.int8]
105105
int64_na = na_values[np.int64]
106106
arr = np.array([int64_na, 2, 3, 10, 15], dtype=np.int64)
107107
expected = np.array([int8_na, 2, 3, 10, 15], dtype=np.int8)
108108
result = lib.downcast_int64(arr, na_values)
109-
self.assert_numpy_array_equal(result, expected)
109+
tm.assert_numpy_array_equal(result, expected)

‎pandas/tests/dtypes/test_missing.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,18 @@ def test_isnull_datetime(self):
148148
mask = isnull(idx)
149149
self.assertTrue(mask[0])
150150
exp = np.array([True] + [False] * (len(idx) - 1), dtype=bool)
151-
self.assert_numpy_array_equal(mask, exp)
151+
tm.assert_numpy_array_equal(mask, exp)
152152

153153
# GH 9129
154154
pidx = idx.to_period(freq='M')
155155
mask = isnull(pidx)
156156
self.assertTrue(mask[0])
157157
exp = np.array([True] + [False] * (len(idx) - 1), dtype=bool)
158-
self.assert_numpy_array_equal(mask, exp)
158+
tm.assert_numpy_array_equal(mask, exp)
159159

160160
mask = isnull(pidx[1:])
161161
exp = np.zeros(len(mask), dtype=bool)
162-
self.assert_numpy_array_equal(mask, exp)
162+
tm.assert_numpy_array_equal(mask, exp)
163163

164164
def test_datetime_other_units(self):
165165
idx = pd.DatetimeIndex(['2011-01-01', 'NaT', '2011-01-02'])

‎pandas/tests/frame/test_alter_axes.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def test_set_index_cast_datetimeindex(self):
233233
result = df['C']
234234
comp = pd.DatetimeIndex(expected.values).copy()
235235
comp.tz = None
236-
self.assert_numpy_array_equal(result.values, comp.values)
236+
tm.assert_numpy_array_equal(result.values, comp.values)
237237

238238
# list of datetimes with a tz
239239
df['D'] = i.to_pydatetime()
@@ -436,8 +436,8 @@ def test_rename_multiindex(self):
436436
new_columns = MultiIndex.from_tuples([('fizz3', 'buzz1'),
437437
('fizz2', 'buzz3')],
438438
names=['fizz', 'buzz'])
439-
self.assert_index_equal(renamed.index, new_index)
440-
self.assert_index_equal(renamed.columns, new_columns)
439+
tm.assert_index_equal(renamed.index, new_index)
440+
tm.assert_index_equal(renamed.columns, new_columns)
441441
self.assertEqual(renamed.index.names, df.index.names)
442442
self.assertEqual(renamed.columns.names, df.columns.names)
443443

@@ -450,46 +450,46 @@ def test_rename_multiindex(self):
450450
names=['fizz', 'buzz'])
451451
renamed = df.rename(columns={'fizz1': 'fizz3', 'buzz2': 'buzz3'},
452452
level=0)
453-
self.assert_index_equal(renamed.columns, new_columns)
453+
tm.assert_index_equal(renamed.columns, new_columns)
454454
renamed = df.rename(columns={'fizz1': 'fizz3', 'buzz2': 'buzz3'},
455455
level='fizz')
456-
self.assert_index_equal(renamed.columns, new_columns)
456+
tm.assert_index_equal(renamed.columns, new_columns)
457457

458458
new_columns = MultiIndex.from_tuples([('fizz1', 'buzz1'),
459459
('fizz2', 'buzz3')],
460460
names=['fizz', 'buzz'])
461461
renamed = df.rename(columns={'fizz1': 'fizz3', 'buzz2': 'buzz3'},
462462
level=1)
463-
self.assert_index_equal(renamed.columns, new_columns)
463+
tm.assert_index_equal(renamed.columns, new_columns)
464464
renamed = df.rename(columns={'fizz1': 'fizz3', 'buzz2': 'buzz3'},
465465
level='buzz')
466-
self.assert_index_equal(renamed.columns, new_columns)
466+
tm.assert_index_equal(renamed.columns, new_columns)
467467

468468
# function
469469
func = str.upper
470470
new_columns = MultiIndex.from_tuples([('FIZZ1', 'buzz1'),
471471
('FIZZ2', 'buzz2')],
472472
names=['fizz', 'buzz'])
473473
renamed = df.rename(columns=func, level=0)
474-
self.assert_index_equal(renamed.columns, new_columns)
474+
tm.assert_index_equal(renamed.columns, new_columns)
475475
renamed = df.rename(columns=func, level='fizz')
476-
self.assert_index_equal(renamed.columns, new_columns)
476+
tm.assert_index_equal(renamed.columns, new_columns)
477477

478478
new_columns = MultiIndex.from_tuples([('fizz1', 'BUZZ1'),
479479
('fizz2', 'BUZZ2')],
480480
names=['fizz', 'buzz'])
481481
renamed = df.rename(columns=func, level=1)
482-
self.assert_index_equal(renamed.columns, new_columns)
482+
tm.assert_index_equal(renamed.columns, new_columns)
483483
renamed = df.rename(columns=func, level='buzz')
484-
self.assert_index_equal(renamed.columns, new_columns)
484+
tm.assert_index_equal(renamed.columns, new_columns)
485485

486486
# index
487487
new_index = MultiIndex.from_tuples([('foo3', 'bar1'),
488488
('foo2', 'bar2')],
489489
names=['foo', 'bar'])
490490
renamed = df.rename(index={'foo1': 'foo3', 'bar2': 'bar3'},
491491
level=0)
492-
self.assert_index_equal(renamed.index, new_index)
492+
tm.assert_index_equal(renamed.index, new_index)
493493

494494
def test_rename_nocopy(self):
495495
renamed = self.frame.rename(columns={'C': 'foo'}, copy=False)
@@ -587,22 +587,22 @@ def test_reset_index(self):
587587
# default name assigned
588588
rdf = self.frame.reset_index()
589589
exp = pd.Series(self.frame.index.values, name='index')
590-
self.assert_series_equal(rdf['index'], exp)
590+
tm.assert_series_equal(rdf['index'], exp)
591591

592592
# default name assigned, corner case
593593
df = self.frame.copy()
594594
df['index'] = 'foo'
595595
rdf = df.reset_index()
596596
exp = pd.Series(self.frame.index.values, name='level_0')
597-
self.assert_series_equal(rdf['level_0'], exp)
597+
tm.assert_series_equal(rdf['level_0'], exp)
598598

599599
# but this is ok
600600
self.frame.index.name = 'index'
601601
deleveled = self.frame.reset_index()
602-
self.assert_series_equal(deleveled['index'],
603-
pd.Series(self.frame.index))
604-
self.assert_index_equal(deleveled.index,
605-
pd.Index(np.arange(len(deleveled))))
602+
tm.assert_series_equal(deleveled['index'],
603+
pd.Series(self.frame.index))
604+
tm.assert_index_equal(deleveled.index,
605+
pd.Index(np.arange(len(deleveled))))
606606

607607
# preserve column names
608608
self.frame.columns.name = 'columns'

‎pandas/tests/frame/test_analytics.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -935,13 +935,13 @@ def test_mean_corner(self):
935935
# unit test when have object data
936936
the_mean = self.mixed_frame.mean(axis=0)
937937
the_sum = self.mixed_frame.sum(axis=0, numeric_only=True)
938-
self.assert_index_equal(the_sum.index, the_mean.index)
938+
tm.assert_index_equal(the_sum.index, the_mean.index)
939939
self.assertTrue(len(the_mean.index) < len(self.mixed_frame.columns))
940940

941941
# xs sum mixed type, just want to know it works...
942942
the_mean = self.mixed_frame.mean(axis=1)
943943
the_sum = self.mixed_frame.sum(axis=1, numeric_only=True)
944-
self.assert_index_equal(the_sum.index, the_mean.index)
944+
tm.assert_index_equal(the_sum.index, the_mean.index)
945945

946946
# take mean of boolean column
947947
self.frame['bool'] = self.frame['A'] > 0
@@ -1758,7 +1758,7 @@ def test_round_issue(self):
17581758

17591759
dfs = pd.concat((df, df), axis=1)
17601760
rounded = dfs.round()
1761-
self.assert_index_equal(rounded.index, dfs.index)
1761+
tm.assert_index_equal(rounded.index, dfs.index)
17621762

17631763
decimals = pd.Series([1, 0, 2], index=['A', 'B', 'A'])
17641764
self.assertRaises(ValueError, df.round, decimals)

‎pandas/tests/frame/test_api.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ def test_get_value(self):
6060
def test_add_prefix_suffix(self):
6161
with_prefix = self.frame.add_prefix('foo#')
6262
expected = pd.Index(['foo#%s' % c for c in self.frame.columns])
63-
self.assert_index_equal(with_prefix.columns, expected)
63+
tm.assert_index_equal(with_prefix.columns, expected)
6464

6565
with_suffix = self.frame.add_suffix('#foo')
6666
expected = pd.Index(['%s#foo' % c for c in self.frame.columns])
67-
self.assert_index_equal(with_suffix.columns, expected)
67+
tm.assert_index_equal(with_suffix.columns, expected)
6868

6969

7070
class TestDataFrameMisc(tm.TestCase, SharedWithSparse, TestData):

‎pandas/tests/frame/test_axis_select_reindex.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ def test_drop_names(self):
4949
# errors = 'ignore'
5050
dropped = df.drop(['g'], errors='ignore')
5151
expected = Index(['a', 'b', 'c'], name='first')
52-
self.assert_index_equal(dropped.index, expected)
52+
tm.assert_index_equal(dropped.index, expected)
5353

5454
dropped = df.drop(['b', 'g'], errors='ignore')
5555
expected = Index(['a', 'c'], name='first')
56-
self.assert_index_equal(dropped.index, expected)
56+
tm.assert_index_equal(dropped.index, expected)
5757

5858
dropped = df.drop(['g'], axis=1, errors='ignore')
5959
expected = Index(['d', 'e', 'f'], name='second')
60-
self.assert_index_equal(dropped.columns, expected)
60+
tm.assert_index_equal(dropped.columns, expected)
6161

6262
dropped = df.drop(['d', 'g'], axis=1, errors='ignore')
6363
expected = Index(['e', 'f'], name='second')
64-
self.assert_index_equal(dropped.columns, expected)
64+
tm.assert_index_equal(dropped.columns, expected)
6565

6666
def test_drop_col_still_multiindex(self):
6767
arrays = [['a', 'b', 'c', 'top'],
@@ -221,7 +221,7 @@ def test_reindex(self):
221221

222222
# pass non-Index
223223
newFrame = self.frame.reindex(list(self.ts1.index))
224-
self.assert_index_equal(newFrame.index, self.ts1.index)
224+
tm.assert_index_equal(newFrame.index, self.ts1.index)
225225

226226
# copy with no axes
227227
result = self.frame.reindex()
@@ -866,7 +866,7 @@ def test_reindex_corner(self):
866866
index = Index(['a', 'b', 'c'])
867867
dm = self.empty.reindex(index=[1, 2, 3])
868868
reindexed = dm.reindex(columns=index)
869-
self.assert_index_equal(reindexed.columns, index)
869+
tm.assert_index_equal(reindexed.columns, index)
870870

871871
# ints are weird
872872
smaller = self.intframe.reindex(columns=['A', 'B', 'E'])

‎pandas/tests/frame/test_block_internals.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,8 @@ def test_get_X_columns(self):
517517
'd': [None, None, None],
518518
'e': [3.14, 0.577, 2.773]})
519519

520-
self.assert_index_equal(df._get_numeric_data().columns,
521-
pd.Index(['a', 'b', 'e']))
520+
tm.assert_index_equal(df._get_numeric_data().columns,
521+
pd.Index(['a', 'b', 'e']))
522522

523523
def test_strange_column_corruption_issue(self):
524524
# (wesm) Unclear how exactly this is related to internal matters

0 commit comments

Comments
 (0)