@@ -1435,37 +1435,38 @@ def test_dt64arr_add_sub_offset_ndarray(self, tz_naive_fixture,
1435
1435
expected = tm .box_expected (expected , box_with_array )
1436
1436
tm .assert_equal (res , expected )
1437
1437
1438
- @pytest .mark .parametrize ("box" , [pd .Index , pd .Series , pd .DataFrame ])
1439
- @pytest .mark .parametrize ("op, offset, exp" , [
1438
+ @pytest .mark .parametrize ("op, offset, exp, exp_freq" , [
1440
1439
('__add__' , pd .DateOffset (months = 3 , days = 10 ),
1441
1440
[Timestamp ('2014-04-11' ), Timestamp ('2015-04-11' ),
1442
- Timestamp ('2016-04-11' ), Timestamp ('2017-04-11' )]),
1441
+ Timestamp ('2016-04-11' ), Timestamp ('2017-04-11' )],
1442
+ None ),
1443
1443
('__add__' , pd .DateOffset (months = 3 ),
1444
1444
[Timestamp ('2014-04-01' ), Timestamp ('2015-04-01' ),
1445
- Timestamp ('2016-04-01' ), Timestamp ('2017-04-01' )]),
1445
+ Timestamp ('2016-04-01' ), Timestamp ('2017-04-01' )],
1446
+ "AS-APR" ),
1446
1447
('__sub__' , pd .DateOffset (months = 3 , days = 10 ),
1447
1448
[Timestamp ('2013-09-21' ), Timestamp ('2014-09-21' ),
1448
- Timestamp ('2015-09-21' ), Timestamp ('2016-09-21' )]),
1449
+ Timestamp ('2015-09-21' ), Timestamp ('2016-09-21' )],
1450
+ None ),
1449
1451
('__sub__' , pd .DateOffset (months = 3 ),
1450
1452
[Timestamp ('2013-10-01' ), Timestamp ('2014-10-01' ),
1451
- Timestamp ('2015-10-01' ), Timestamp ('2016-10-01' )])
1452
-
1453
+ Timestamp ('2015-10-01' ), Timestamp ('2016-10-01' )],
1454
+ "AS-OCT" )
1453
1455
])
1454
- def test_dti_add_sub_nonzero_mth_offset (self , op , offset , exp ,
1456
+ def test_dti_add_sub_nonzero_mth_offset (self , op , offset ,
1457
+ exp , exp_freq ,
1455
1458
tz_aware_fixture ,
1456
- box ):
1459
+ box_with_array ):
1457
1460
# GH 26258
1458
1461
tz = tz_aware_fixture
1459
1462
date = date_range (start = '01 Jan 2014' , end = '01 Jan 2017' , freq = 'AS' ,
1460
1463
tz = tz )
1461
- date = (tm .box_expected (date , box ) if box is not pd .DataFrame
1462
- else tm .box_expected (date , box , False ))
1464
+ date = tm .box_expected (date , box_with_array , False )
1463
1465
mth = getattr (date , op )
1464
1466
result = mth (offset )
1465
1467
1466
- expected = pd .Index (exp , tz = tz )
1467
- expected = (tm .box_expected (expected , box ) if box is not pd .DataFrame
1468
- else tm .box_expected (expected , box , False ))
1468
+ expected = pd .DatetimeIndex (exp , tz = tz , freq = exp_freq )
1469
+ expected = tm .box_expected (expected , box_with_array , False )
1469
1470
tm .assert_equal (result , expected )
1470
1471
1471
1472
0 commit comments