Skip to content

Commit 53f81a1

Browse files
SaturnFromTitanjreback
authored andcommitted
CLN: Consistent pandas.util.testing imports in pandas/tests/series/indexing (#29277)
1 parent 58ecadf commit 53f81a1

File tree

7 files changed

+217
-226
lines changed

7 files changed

+217
-226
lines changed

pandas/tests/series/indexing/test_alter_index.py

+31-32
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import pandas as pd
77
from pandas import Categorical, Series, date_range, isna
88
import pandas.util.testing as tm
9-
from pandas.util.testing import assert_series_equal
109

1110

1211
@pytest.mark.parametrize(
@@ -41,8 +40,8 @@ def test_align(datetime_series, first_slice, second_slice, join_type, fill):
4140
ea = ea.fillna(fill)
4241
eb = eb.fillna(fill)
4342

44-
assert_series_equal(aa, ea)
45-
assert_series_equal(ab, eb)
43+
tm.assert_series_equal(aa, ea)
44+
tm.assert_series_equal(ab, eb)
4645
assert aa.name == "ts"
4746
assert ea.name == "ts"
4847
assert ab.name == "ts"
@@ -75,8 +74,8 @@ def test_align_fill_method(
7574
ea = ea.fillna(method=method, limit=limit)
7675
eb = eb.fillna(method=method, limit=limit)
7776

78-
assert_series_equal(aa, ea)
79-
assert_series_equal(ab, eb)
77+
tm.assert_series_equal(aa, ea)
78+
tm.assert_series_equal(ab, eb)
8079

8180

8281
def test_align_nocopy(datetime_series):
@@ -197,12 +196,12 @@ def test_reindex_nan():
197196
ts = Series([2, 3, 5, 7], index=[1, 4, np.nan, 8])
198197

199198
i, j = [np.nan, 1, np.nan, 8, 4, np.nan], [2, 0, 2, 3, 1, 2]
200-
assert_series_equal(ts.reindex(i), ts.iloc[j])
199+
tm.assert_series_equal(ts.reindex(i), ts.iloc[j])
201200

202201
ts.index = ts.index.astype("object")
203202

204203
# reindex coerces index.dtype to float, loc/iloc doesn't
205-
assert_series_equal(ts.reindex(i), ts.iloc[j], check_index_type=False)
204+
tm.assert_series_equal(ts.reindex(i), ts.iloc[j], check_index_type=False)
206205

207206

208207
def test_reindex_series_add_nat():
@@ -239,7 +238,7 @@ def test_reindex_corner(datetime_series):
239238

240239
# pass non-Index
241240
reindexed = datetime_series.reindex(list(datetime_series.index))
242-
assert_series_equal(datetime_series, reindexed)
241+
tm.assert_series_equal(datetime_series, reindexed)
243242

244243
# bad fill method
245244
ts = datetime_series[::2]
@@ -257,10 +256,10 @@ def test_reindex_pad():
257256

258257
reindexed = s2.reindex(s.index, method="pad")
259258
reindexed2 = s2.reindex(s.index, method="ffill")
260-
assert_series_equal(reindexed, reindexed2)
259+
tm.assert_series_equal(reindexed, reindexed2)
261260

262261
expected = Series([0, 0, 2, 2, 4, 4, 6, 6, 8, 8], index=np.arange(10))
263-
assert_series_equal(reindexed, expected)
262+
tm.assert_series_equal(reindexed, expected)
264263

265264
# GH4604
266265
s = Series([1, 2, 3, 4, 5], index=["a", "b", "c", "d", "e"])
@@ -269,51 +268,51 @@ def test_reindex_pad():
269268

270269
# this changes dtype because the ffill happens after
271270
result = s.reindex(new_index).ffill()
272-
assert_series_equal(result, expected.astype("float64"))
271+
tm.assert_series_equal(result, expected.astype("float64"))
273272

274273
result = s.reindex(new_index).ffill(downcast="infer")
275-
assert_series_equal(result, expected)
274+
tm.assert_series_equal(result, expected)
276275

277276
expected = Series([1, 5, 3, 5], index=new_index)
278277
result = s.reindex(new_index, method="ffill")
279-
assert_series_equal(result, expected)
278+
tm.assert_series_equal(result, expected)
280279

281280
# inference of new dtype
282281
s = Series([True, False, False, True], index=list("abcd"))
283282
new_index = "agc"
284283
result = s.reindex(list(new_index)).ffill()
285284
expected = Series([True, True, False], index=list(new_index))
286-
assert_series_equal(result, expected)
285+
tm.assert_series_equal(result, expected)
287286

288287
# GH4618 shifted series downcasting
289288
s = Series(False, index=range(0, 5))
290289
result = s.shift(1).fillna(method="bfill")
291290
expected = Series(False, index=range(0, 5))
292-
assert_series_equal(result, expected)
291+
tm.assert_series_equal(result, expected)
293292

294293

295294
def test_reindex_nearest():
296295
s = Series(np.arange(10, dtype="int64"))
297296
target = [0.1, 0.9, 1.5, 2.0]
298297
actual = s.reindex(target, method="nearest")
299298
expected = Series(np.around(target).astype("int64"), target)
300-
assert_series_equal(expected, actual)
299+
tm.assert_series_equal(expected, actual)
301300

302301
actual = s.reindex_like(actual, method="nearest")
303-
assert_series_equal(expected, actual)
302+
tm.assert_series_equal(expected, actual)
304303

305304
actual = s.reindex_like(actual, method="nearest", tolerance=1)
306-
assert_series_equal(expected, actual)
305+
tm.assert_series_equal(expected, actual)
307306
actual = s.reindex_like(actual, method="nearest", tolerance=[1, 2, 3, 4])
308-
assert_series_equal(expected, actual)
307+
tm.assert_series_equal(expected, actual)
309308

310309
actual = s.reindex(target, method="nearest", tolerance=0.2)
311310
expected = Series([0, 1, np.nan, 2], target)
312-
assert_series_equal(expected, actual)
311+
tm.assert_series_equal(expected, actual)
313312

314313
actual = s.reindex(target, method="nearest", tolerance=[0.3, 0.01, 0.4, 3])
315314
expected = Series([0, np.nan, np.nan, 2], target)
316-
assert_series_equal(expected, actual)
315+
tm.assert_series_equal(expected, actual)
317316

318317

319318
def test_reindex_backfill():
@@ -385,7 +384,7 @@ def test_reindex_categorical():
385384

386385
def test_reindex_like(datetime_series):
387386
other = datetime_series[::2]
388-
assert_series_equal(
387+
tm.assert_series_equal(
389388
datetime_series.reindex(other.index), datetime_series.reindex_like(other)
390389
)
391390

@@ -399,7 +398,7 @@ def test_reindex_like(datetime_series):
399398

400399
result = series1.reindex_like(series2, method="pad")
401400
expected = Series([5, np.nan], index=[day1, day3])
402-
assert_series_equal(result, expected)
401+
tm.assert_series_equal(result, expected)
403402

404403

405404
def test_reindex_fill_value():
@@ -408,49 +407,49 @@ def test_reindex_fill_value():
408407
floats = Series([1.0, 2.0, 3.0])
409408
result = floats.reindex([1, 2, 3])
410409
expected = Series([2.0, 3.0, np.nan], index=[1, 2, 3])
411-
assert_series_equal(result, expected)
410+
tm.assert_series_equal(result, expected)
412411

413412
result = floats.reindex([1, 2, 3], fill_value=0)
414413
expected = Series([2.0, 3.0, 0], index=[1, 2, 3])
415-
assert_series_equal(result, expected)
414+
tm.assert_series_equal(result, expected)
416415

417416
# -----------------------------------------------------------
418417
# ints
419418
ints = Series([1, 2, 3])
420419

421420
result = ints.reindex([1, 2, 3])
422421
expected = Series([2.0, 3.0, np.nan], index=[1, 2, 3])
423-
assert_series_equal(result, expected)
422+
tm.assert_series_equal(result, expected)
424423

425424
# don't upcast
426425
result = ints.reindex([1, 2, 3], fill_value=0)
427426
expected = Series([2, 3, 0], index=[1, 2, 3])
428427
assert issubclass(result.dtype.type, np.integer)
429-
assert_series_equal(result, expected)
428+
tm.assert_series_equal(result, expected)
430429

431430
# -----------------------------------------------------------
432431
# objects
433432
objects = Series([1, 2, 3], dtype=object)
434433

435434
result = objects.reindex([1, 2, 3])
436435
expected = Series([2, 3, np.nan], index=[1, 2, 3], dtype=object)
437-
assert_series_equal(result, expected)
436+
tm.assert_series_equal(result, expected)
438437

439438
result = objects.reindex([1, 2, 3], fill_value="foo")
440439
expected = Series([2, 3, "foo"], index=[1, 2, 3], dtype=object)
441-
assert_series_equal(result, expected)
440+
tm.assert_series_equal(result, expected)
442441

443442
# ------------------------------------------------------------
444443
# bools
445444
bools = Series([True, False, True])
446445

447446
result = bools.reindex([1, 2, 3])
448447
expected = Series([False, True, np.nan], index=[1, 2, 3], dtype=object)
449-
assert_series_equal(result, expected)
448+
tm.assert_series_equal(result, expected)
450449

451450
result = bools.reindex([1, 2, 3], fill_value=False)
452451
expected = Series([False, True, False], index=[1, 2, 3])
453-
assert_series_equal(result, expected)
452+
tm.assert_series_equal(result, expected)
454453

455454

456455
def test_reindex_datetimeindexes_tz_naive_and_aware():
@@ -474,7 +473,7 @@ def test_rename():
474473
s = Series(range(1, 6), index=pd.Index(range(2, 7), name="IntIndex"))
475474
result = s.rename(str)
476475
expected = s.rename(lambda i: str(i))
477-
assert_series_equal(result, expected)
476+
tm.assert_series_equal(result, expected)
478477

479478
assert result.name == expected.name
480479

0 commit comments

Comments
 (0)