@@ -1435,27 +1435,39 @@ 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 ("op, offset, exp" , [
1438
+ @pytest .mark .parametrize ("op, offset, exp, exp_freq " , [
1439
1439
('__add__' , pd .DateOffset (months = 3 , days = 10 ),
1440
- DatetimeIndex ([Timestamp ('2014-04-11' ), Timestamp ('2015-04-11' ),
1441
- Timestamp ('2016-04-11' ), Timestamp ('2017-04-11' )])),
1440
+ [Timestamp ('2014-04-11' ), Timestamp ('2015-04-11' ),
1441
+ Timestamp ('2016-04-11' ), Timestamp ('2017-04-11' )],
1442
+ None ),
1442
1443
('__add__' , pd .DateOffset (months = 3 ),
1443
- DatetimeIndex ([Timestamp ('2014-04-01' ), Timestamp ('2015-04-01' ),
1444
- Timestamp ('2016-04-01' ), Timestamp ('2017-04-01' )])),
1444
+ [Timestamp ('2014-04-01' ), Timestamp ('2015-04-01' ),
1445
+ Timestamp ('2016-04-01' ), Timestamp ('2017-04-01' )],
1446
+ "AS-APR" ),
1445
1447
('__sub__' , pd .DateOffset (months = 3 , days = 10 ),
1446
- DatetimeIndex ([Timestamp ('2013-09-21' ), Timestamp ('2014-09-21' ),
1447
- Timestamp ('2015-09-21' ), Timestamp ('2016-09-21' )])),
1448
+ [Timestamp ('2013-09-21' ), Timestamp ('2014-09-21' ),
1449
+ Timestamp ('2015-09-21' ), Timestamp ('2016-09-21' )],
1450
+ None ),
1448
1451
('__sub__' , pd .DateOffset (months = 3 ),
1449
- DatetimeIndex ( [Timestamp ('2013-10-01' ), Timestamp ('2014-10-01' ),
1450
- Timestamp ('2015-10-01' ), Timestamp ('2016-10-01' )]))
1451
-
1452
+ [Timestamp ('2013-10-01' ), Timestamp ('2014-10-01' ),
1453
+ Timestamp ('2015-10-01' ), Timestamp ('2016-10-01' )],
1454
+ "AS-OCT" )
1452
1455
])
1453
- 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 ,
1458
+ tz_aware_fixture ,
1459
+ box_with_array ):
1454
1460
# GH 26258
1455
- date = date_range (start = '01 Jan 2014' , end = '01 Jan 2017' , freq = 'AS' )
1461
+ tz = tz_aware_fixture
1462
+ date = date_range (start = '01 Jan 2014' , end = '01 Jan 2017' , freq = 'AS' ,
1463
+ tz = tz )
1464
+ date = tm .box_expected (date , box_with_array , False )
1456
1465
mth = getattr (date , op )
1457
1466
result = mth (offset )
1458
- tm .assert_equal (result , exp )
1467
+
1468
+ expected = pd .DatetimeIndex (exp , tz = tz , freq = exp_freq )
1469
+ expected = tm .box_expected (expected , box_with_array , False )
1470
+ tm .assert_equal (result , expected )
1459
1471
1460
1472
1461
1473
class TestDatetime64OverflowHandling :
0 commit comments