Skip to content

be more careful with half-opened date_range #11806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 17, 2015
Merged

be more careful with half-opened date_range #11806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.18.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ Bug Fixes
- Bug in ``GroupBy.size`` when data-frame is empty. (:issue:`11699`)
- Bug in ``Period.end_time`` when a multiple of time period is requested (:issue:`11738`)
- Regression in ``.clip`` with tz-aware datetimes (:issue:`11838`)
- Bug in ``date_range`` when the boundaries fell on the frequency (:issue:`11804`)



Expand Down
5 changes: 2 additions & 3 deletions pandas/tseries/index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,9 @@ def _generate(cls, start, end, periods, name, offset,
index = index.view(_NS_DTYPE)

index = cls._simple_new(index, name=name, freq=offset, tz=tz)

if not left_closed:
if not left_closed and len(index) and index[0] == start:
index = index[1:]
if not right_closed:
if not right_closed and len(index) and index[-1] == end:
index = index[:-1]

return index
Expand Down
28 changes: 26 additions & 2 deletions pandas/tseries/tests/test_daterange.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,13 +477,37 @@ def test_range_closed(self):
closed = date_range(begin, end, closed=None, freq=freq)
left = date_range(begin, end, closed="left", freq=freq)
right = date_range(begin, end, closed="right", freq=freq)
expected_left = left
expected_right = right

expected_left = closed[:-1]
expected_right = closed[1:]
if end == closed[-1]:
expected_left = closed[:-1]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is expected_left / right otherwise?

if begin == closed[0]:
expected_right = closed[1:]

self.assertTrue(expected_left.equals(left))
self.assertTrue(expected_right.equals(right))

def test_range_closed_boundary(self):
# GH 11804
for closed in ['right', 'left', None]:
right_boundary = date_range('2015-09-12', '2015-12-01', freq='QS-MAR', closed=closed)
left_boundary = date_range('2015-09-01', '2015-09-12', freq='QS-MAR', closed=closed)
both_boundary = date_range('2015-09-01', '2015-12-01', freq='QS-MAR', closed=closed)
expected_right = expected_left = expected_both = both_boundary

if closed == 'right':
expected_left = both_boundary[1:]
if closed == 'left':
expected_right = both_boundary[:-1]
if closed is None:
expected_right = both_boundary[1:]
expected_left = both_boundary[:-1]

self.assertTrue(right_boundary.equals(expected_right))
self.assertTrue(left_boundary.equals(expected_left))
self.assertTrue(both_boundary.equals(expected_both))

def test_years_only(self):
# GH 6961
dr = date_range('2014', '2015', freq='M')
Expand Down