@@ -548,9 +548,9 @@ def test_range_closed(self, freq):
548
548
begin = datetime (2011 , 1 , 1 )
549
549
end = datetime (2014 , 1 , 1 )
550
550
551
- closed = date_range (begin , end , closed = None , freq = freq )
552
- left = date_range (begin , end , closed = "left" , freq = freq )
553
- right = date_range (begin , end , closed = "right" , freq = freq )
551
+ closed = date_range (begin , end , inclusive = "both" , freq = freq )
552
+ left = date_range (begin , end , inclusive = "left" , freq = freq )
553
+ right = date_range (begin , end , inclusive = "right" , freq = freq )
554
554
expected_left = left
555
555
expected_right = right
556
556
@@ -568,9 +568,9 @@ def test_range_closed_with_tz_aware_start_end(self):
568
568
end = Timestamp ("2014/1/1" , tz = "US/Eastern" )
569
569
570
570
for freq in ["1D" , "3D" , "2M" , "7W" , "3H" , "A" ]:
571
- closed = date_range (begin , end , closed = None , freq = freq )
572
- left = date_range (begin , end , closed = "left" , freq = freq )
573
- right = date_range (begin , end , closed = "right" , freq = freq )
571
+ closed = date_range (begin , end , inclusive = "both" , freq = freq )
572
+ left = date_range (begin , end , inclusive = "left" , freq = freq )
573
+ right = date_range (begin , end , inclusive = "right" , freq = freq )
574
574
expected_left = left
575
575
expected_right = right
576
576
@@ -588,9 +588,9 @@ def test_range_closed_with_tz_aware_start_end(self):
588
588
endtz = Timestamp ("2014/1/1" , tz = "US/Eastern" )
589
589
590
590
for freq in ["1D" , "3D" , "2M" , "7W" , "3H" , "A" ]:
591
- closed = date_range (begin , end , closed = None , freq = freq , tz = "US/Eastern" )
592
- left = date_range (begin , end , closed = "left" , freq = freq , tz = "US/Eastern" )
593
- right = date_range (begin , end , closed = "right" , freq = freq , tz = "US/Eastern" )
591
+ closed = date_range (begin , end , inclusive = "both" , freq = freq , tz = "US/Eastern" )
592
+ left = date_range (begin , end , inclusive = "left" , freq = freq , tz = "US/Eastern" )
593
+ right = date_range (begin , end , inclusive = "right" , freq = freq , tz = "US/Eastern" )
594
594
expected_left = left
595
595
expected_right = right
596
596
@@ -602,27 +602,30 @@ def test_range_closed_with_tz_aware_start_end(self):
602
602
tm .assert_index_equal (expected_left , left )
603
603
tm .assert_index_equal (expected_right , right )
604
604
605
- @pytest .mark .parametrize ("closed " , ["right" , "left" , None ])
606
- def test_range_closed_boundary (self , closed ):
605
+ @pytest .mark .parametrize ("inclusive " , ["right" , "left" , "both" , "neither" ])
606
+ def test_range_closed_boundary (self , inclusive ):
607
607
# GH#11804
608
608
right_boundary = date_range (
609
- "2015-09-12" , "2015-12-01" , freq = "QS-MAR" , closed = closed
609
+ "2015-09-12" , "2015-12-01" , freq = "QS-MAR" , inclusive = inclusive
610
610
)
611
611
left_boundary = date_range (
612
- "2015-09-01" , "2015-09-12" , freq = "QS-MAR" , closed = closed
612
+ "2015-09-01" , "2015-09-12" , freq = "QS-MAR" , inclusive = inclusive
613
613
)
614
614
both_boundary = date_range (
615
- "2015-09-01" , "2015-12-01" , freq = "QS-MAR" , closed = closed
615
+ "2015-09-01" , "2015-12-01" , freq = "QS-MAR" , inclusive = inclusive
616
616
)
617
617
expected_right = expected_left = expected_both = both_boundary
618
618
619
- if closed == "right" :
619
+ if inclusive == "right" :
620
620
expected_left = both_boundary [1 :]
621
- if closed == "left" :
621
+ if inclusive == "left" :
622
622
expected_right = both_boundary [:- 1 ]
623
- if closed is None :
623
+ if inclusive == "both" :
624
624
expected_right = both_boundary [1 :]
625
625
expected_left = both_boundary [:- 1 ]
626
+ if inclusive == "neither" :
627
+ expected_left = both_boundary [1 :]
628
+ expected_right = both_boundary [:- 1 ]
626
629
627
630
tm .assert_index_equal (right_boundary , expected_right )
628
631
tm .assert_index_equal (left_boundary , expected_left )
@@ -867,12 +870,12 @@ def test_daterange_bug_456(self):
867
870
result = rng1 .union (rng2 )
868
871
assert isinstance (result , DatetimeIndex )
869
872
870
- @pytest .mark .parametrize ("closed " , ["left" , "right" ])
871
- def test_bdays_and_open_boundaries (self , closed ):
873
+ @pytest .mark .parametrize ("inclusive " , ["left" , "right" ])
874
+ def test_bdays_and_open_boundaries (self , inclusive ):
872
875
# GH 6673
873
876
start = "2018-07-21" # Saturday
874
877
end = "2018-07-29" # Sunday
875
- result = date_range (start , end , freq = "B" , closed = closed )
878
+ result = date_range (start , end , freq = "B" , inclusive = inclusive )
876
879
877
880
bday_start = "2018-07-23" # Monday
878
881
bday_end = "2018-07-27" # Friday
@@ -1018,7 +1021,7 @@ def test_all_custom_freq(self, freq):
1018
1021
def test_range_with_millisecond_resolution (self , start_end ):
1019
1022
# https://github.com/pandas-dev/pandas/issues/24110
1020
1023
start , end = start_end
1021
- result = date_range (start = start , end = end , periods = 2 , closed = "left" )
1024
+ result = date_range (start = start , end = end , periods = 2 , inclusive = "left" )
1022
1025
expected = DatetimeIndex ([start ])
1023
1026
tm .assert_index_equal (result , expected )
1024
1027
0 commit comments