6
6
import pandas as pd
7
7
from pandas import Categorical , Series , date_range , isna
8
8
import pandas .util .testing as tm
9
- from pandas .util .testing import assert_series_equal
10
9
11
10
12
11
@pytest .mark .parametrize (
@@ -41,8 +40,8 @@ def test_align(datetime_series, first_slice, second_slice, join_type, fill):
41
40
ea = ea .fillna (fill )
42
41
eb = eb .fillna (fill )
43
42
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 )
46
45
assert aa .name == "ts"
47
46
assert ea .name == "ts"
48
47
assert ab .name == "ts"
@@ -75,8 +74,8 @@ def test_align_fill_method(
75
74
ea = ea .fillna (method = method , limit = limit )
76
75
eb = eb .fillna (method = method , limit = limit )
77
76
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 )
80
79
81
80
82
81
def test_align_nocopy (datetime_series ):
@@ -197,12 +196,12 @@ def test_reindex_nan():
197
196
ts = Series ([2 , 3 , 5 , 7 ], index = [1 , 4 , np .nan , 8 ])
198
197
199
198
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 ])
201
200
202
201
ts .index = ts .index .astype ("object" )
203
202
204
203
# 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 )
206
205
207
206
208
207
def test_reindex_series_add_nat ():
@@ -239,7 +238,7 @@ def test_reindex_corner(datetime_series):
239
238
240
239
# pass non-Index
241
240
reindexed = datetime_series .reindex (list (datetime_series .index ))
242
- assert_series_equal (datetime_series , reindexed )
241
+ tm . assert_series_equal (datetime_series , reindexed )
243
242
244
243
# bad fill method
245
244
ts = datetime_series [::2 ]
@@ -257,10 +256,10 @@ def test_reindex_pad():
257
256
258
257
reindexed = s2 .reindex (s .index , method = "pad" )
259
258
reindexed2 = s2 .reindex (s .index , method = "ffill" )
260
- assert_series_equal (reindexed , reindexed2 )
259
+ tm . assert_series_equal (reindexed , reindexed2 )
261
260
262
261
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 )
264
263
265
264
# GH4604
266
265
s = Series ([1 , 2 , 3 , 4 , 5 ], index = ["a" , "b" , "c" , "d" , "e" ])
@@ -269,51 +268,51 @@ def test_reindex_pad():
269
268
270
269
# this changes dtype because the ffill happens after
271
270
result = s .reindex (new_index ).ffill ()
272
- assert_series_equal (result , expected .astype ("float64" ))
271
+ tm . assert_series_equal (result , expected .astype ("float64" ))
273
272
274
273
result = s .reindex (new_index ).ffill (downcast = "infer" )
275
- assert_series_equal (result , expected )
274
+ tm . assert_series_equal (result , expected )
276
275
277
276
expected = Series ([1 , 5 , 3 , 5 ], index = new_index )
278
277
result = s .reindex (new_index , method = "ffill" )
279
- assert_series_equal (result , expected )
278
+ tm . assert_series_equal (result , expected )
280
279
281
280
# inference of new dtype
282
281
s = Series ([True , False , False , True ], index = list ("abcd" ))
283
282
new_index = "agc"
284
283
result = s .reindex (list (new_index )).ffill ()
285
284
expected = Series ([True , True , False ], index = list (new_index ))
286
- assert_series_equal (result , expected )
285
+ tm . assert_series_equal (result , expected )
287
286
288
287
# GH4618 shifted series downcasting
289
288
s = Series (False , index = range (0 , 5 ))
290
289
result = s .shift (1 ).fillna (method = "bfill" )
291
290
expected = Series (False , index = range (0 , 5 ))
292
- assert_series_equal (result , expected )
291
+ tm . assert_series_equal (result , expected )
293
292
294
293
295
294
def test_reindex_nearest ():
296
295
s = Series (np .arange (10 , dtype = "int64" ))
297
296
target = [0.1 , 0.9 , 1.5 , 2.0 ]
298
297
actual = s .reindex (target , method = "nearest" )
299
298
expected = Series (np .around (target ).astype ("int64" ), target )
300
- assert_series_equal (expected , actual )
299
+ tm . assert_series_equal (expected , actual )
301
300
302
301
actual = s .reindex_like (actual , method = "nearest" )
303
- assert_series_equal (expected , actual )
302
+ tm . assert_series_equal (expected , actual )
304
303
305
304
actual = s .reindex_like (actual , method = "nearest" , tolerance = 1 )
306
- assert_series_equal (expected , actual )
305
+ tm . assert_series_equal (expected , actual )
307
306
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 )
309
308
310
309
actual = s .reindex (target , method = "nearest" , tolerance = 0.2 )
311
310
expected = Series ([0 , 1 , np .nan , 2 ], target )
312
- assert_series_equal (expected , actual )
311
+ tm . assert_series_equal (expected , actual )
313
312
314
313
actual = s .reindex (target , method = "nearest" , tolerance = [0.3 , 0.01 , 0.4 , 3 ])
315
314
expected = Series ([0 , np .nan , np .nan , 2 ], target )
316
- assert_series_equal (expected , actual )
315
+ tm . assert_series_equal (expected , actual )
317
316
318
317
319
318
def test_reindex_backfill ():
@@ -385,7 +384,7 @@ def test_reindex_categorical():
385
384
386
385
def test_reindex_like (datetime_series ):
387
386
other = datetime_series [::2 ]
388
- assert_series_equal (
387
+ tm . assert_series_equal (
389
388
datetime_series .reindex (other .index ), datetime_series .reindex_like (other )
390
389
)
391
390
@@ -399,7 +398,7 @@ def test_reindex_like(datetime_series):
399
398
400
399
result = series1 .reindex_like (series2 , method = "pad" )
401
400
expected = Series ([5 , np .nan ], index = [day1 , day3 ])
402
- assert_series_equal (result , expected )
401
+ tm . assert_series_equal (result , expected )
403
402
404
403
405
404
def test_reindex_fill_value ():
@@ -408,49 +407,49 @@ def test_reindex_fill_value():
408
407
floats = Series ([1.0 , 2.0 , 3.0 ])
409
408
result = floats .reindex ([1 , 2 , 3 ])
410
409
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 )
412
411
413
412
result = floats .reindex ([1 , 2 , 3 ], fill_value = 0 )
414
413
expected = Series ([2.0 , 3.0 , 0 ], index = [1 , 2 , 3 ])
415
- assert_series_equal (result , expected )
414
+ tm . assert_series_equal (result , expected )
416
415
417
416
# -----------------------------------------------------------
418
417
# ints
419
418
ints = Series ([1 , 2 , 3 ])
420
419
421
420
result = ints .reindex ([1 , 2 , 3 ])
422
421
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 )
424
423
425
424
# don't upcast
426
425
result = ints .reindex ([1 , 2 , 3 ], fill_value = 0 )
427
426
expected = Series ([2 , 3 , 0 ], index = [1 , 2 , 3 ])
428
427
assert issubclass (result .dtype .type , np .integer )
429
- assert_series_equal (result , expected )
428
+ tm . assert_series_equal (result , expected )
430
429
431
430
# -----------------------------------------------------------
432
431
# objects
433
432
objects = Series ([1 , 2 , 3 ], dtype = object )
434
433
435
434
result = objects .reindex ([1 , 2 , 3 ])
436
435
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 )
438
437
439
438
result = objects .reindex ([1 , 2 , 3 ], fill_value = "foo" )
440
439
expected = Series ([2 , 3 , "foo" ], index = [1 , 2 , 3 ], dtype = object )
441
- assert_series_equal (result , expected )
440
+ tm . assert_series_equal (result , expected )
442
441
443
442
# ------------------------------------------------------------
444
443
# bools
445
444
bools = Series ([True , False , True ])
446
445
447
446
result = bools .reindex ([1 , 2 , 3 ])
448
447
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 )
450
449
451
450
result = bools .reindex ([1 , 2 , 3 ], fill_value = False )
452
451
expected = Series ([False , True , False ], index = [1 , 2 , 3 ])
453
- assert_series_equal (result , expected )
452
+ tm . assert_series_equal (result , expected )
454
453
455
454
456
455
def test_reindex_datetimeindexes_tz_naive_and_aware ():
@@ -474,7 +473,7 @@ def test_rename():
474
473
s = Series (range (1 , 6 ), index = pd .Index (range (2 , 7 ), name = "IntIndex" ))
475
474
result = s .rename (str )
476
475
expected = s .rename (lambda i : str (i ))
477
- assert_series_equal (result , expected )
476
+ tm . assert_series_equal (result , expected )
478
477
479
478
assert result .name == expected .name
480
479
0 commit comments