Skip to content

Commit 3708e54

Browse files
committed
modify tests
1 parent 704820f commit 3708e54

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

pandas/tests/indexes/datetimes/test_date_range.py

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,9 @@ def test_range_closed(self, freq):
548548
begin = datetime(2011, 1, 1)
549549
end = datetime(2014, 1, 1)
550550

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)
554554
expected_left = left
555555
expected_right = right
556556

@@ -568,9 +568,9 @@ def test_range_closed_with_tz_aware_start_end(self):
568568
end = Timestamp("2014/1/1", tz="US/Eastern")
569569

570570
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)
574574
expected_left = left
575575
expected_right = right
576576

@@ -588,9 +588,9 @@ def test_range_closed_with_tz_aware_start_end(self):
588588
endtz = Timestamp("2014/1/1", tz="US/Eastern")
589589

590590
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")
594594
expected_left = left
595595
expected_right = right
596596

@@ -602,27 +602,30 @@ def test_range_closed_with_tz_aware_start_end(self):
602602
tm.assert_index_equal(expected_left, left)
603603
tm.assert_index_equal(expected_right, right)
604604

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):
607607
# GH#11804
608608
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
610610
)
611611
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
613613
)
614614
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
616616
)
617617
expected_right = expected_left = expected_both = both_boundary
618618

619-
if closed == "right":
619+
if inclusive == "right":
620620
expected_left = both_boundary[1:]
621-
if closed == "left":
621+
if inclusive == "left":
622622
expected_right = both_boundary[:-1]
623-
if closed is None:
623+
if inclusive == "both":
624624
expected_right = both_boundary[1:]
625625
expected_left = both_boundary[:-1]
626+
if inclusive == "neither":
627+
expected_left = both_boundary[1:]
628+
expected_right = both_boundary[:-1]
626629

627630
tm.assert_index_equal(right_boundary, expected_right)
628631
tm.assert_index_equal(left_boundary, expected_left)
@@ -867,12 +870,12 @@ def test_daterange_bug_456(self):
867870
result = rng1.union(rng2)
868871
assert isinstance(result, DatetimeIndex)
869872

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):
872875
# GH 6673
873876
start = "2018-07-21" # Saturday
874877
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)
876879

877880
bday_start = "2018-07-23" # Monday
878881
bday_end = "2018-07-27" # Friday
@@ -1018,7 +1021,7 @@ def test_all_custom_freq(self, freq):
10181021
def test_range_with_millisecond_resolution(self, start_end):
10191022
# https://github.com/pandas-dev/pandas/issues/24110
10201023
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")
10221025
expected = DatetimeIndex([start])
10231026
tm.assert_index_equal(result, expected)
10241027

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ exclude = '''
4444
[tool.pytest.ini_options]
4545
# sync minversion with pyproject.toml & install.rst
4646
minversion = "6.0"
47-
addopts = "--strict-data-files --strict-markers --capture=no --durations=30 --junitxml=test-data.xml"
47+
addopts = "--strict-markers --capture=no --durations=30 --junitxml=test-data.xml"
4848
xfail_strict = true
4949
testpaths = "pandas"
5050
doctest_optionflags = [

0 commit comments

Comments
 (0)