From 66e97032dd7d144ee9596330340ec9a4c98f01b4 Mon Sep 17 00:00:00 2001 From: Markgolzh <1134386961@qq.com> Date: Mon, 20 Jul 2020 15:18:25 +0800 Subject: [PATCH 1/4] Update datetimes.py change some issues be metioned at #35342 --- pandas/core/arrays/datetimes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/core/arrays/datetimes.py b/pandas/core/arrays/datetimes.py index d674b1c476d2c..0581bff0bf698 100644 --- a/pandas/core/arrays/datetimes.py +++ b/pandas/core/arrays/datetimes.py @@ -2398,6 +2398,7 @@ def generate_range(start=None, end=None, periods=None, offset=BDay()): elif end and not offset.is_on_offset(end): end = offset.rollback(end) + end = Timestamp(str(end).split(' ')[0] + ' 23:59:59') if periods is None and end < start and offset.n >= 0: end = None From a1a4fe051d49149121819750d56c5b9739be70bb Mon Sep 17 00:00:00 2001 From: Markgolzh <1134386961@qq.com> Date: Thu, 23 Jul 2020 14:19:42 +0800 Subject: [PATCH 2/4] fix date_range returns wrong output in some cases change end time in generate_range function in datetimes file --- pandas/core/arrays/datetimes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/core/arrays/datetimes.py b/pandas/core/arrays/datetimes.py index 0581bff0bf698..4b042cf2b33b2 100644 --- a/pandas/core/arrays/datetimes.py +++ b/pandas/core/arrays/datetimes.py @@ -2398,6 +2398,7 @@ def generate_range(start=None, end=None, periods=None, offset=BDay()): elif end and not offset.is_on_offset(end): end = offset.rollback(end) + # https://github.com/pandas-dev/pandas/issues/35342 end = Timestamp(str(end).split(' ')[0] + ' 23:59:59') if periods is None and end < start and offset.n >= 0: From 28eff6824c8df6d3d32a81d23b4ce69d9dce0986 Mon Sep 17 00:00:00 2001 From: Markgolzh <1134386961@qq.com> Date: Thu, 23 Jul 2020 15:13:49 +0800 Subject: [PATCH 3/4] change comment before fix issues be metioned at #35342 --- pandas/core/arrays/datetimes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/arrays/datetimes.py b/pandas/core/arrays/datetimes.py index 4b042cf2b33b2..39f563d777ea0 100644 --- a/pandas/core/arrays/datetimes.py +++ b/pandas/core/arrays/datetimes.py @@ -2398,7 +2398,7 @@ def generate_range(start=None, end=None, periods=None, offset=BDay()): elif end and not offset.is_on_offset(end): end = offset.rollback(end) - # https://github.com/pandas-dev/pandas/issues/35342 + # fix issues be metioned at #35342 end = Timestamp(str(end).split(' ')[0] + ' 23:59:59') if periods is None and end < start and offset.n >= 0: From 1de42935532af56dab363c8b707f346ebc00c930 Mon Sep 17 00:00:00 2001 From: Markgolzh <1134386961@qq.com> Date: Fri, 24 Jul 2020 11:29:43 +0800 Subject: [PATCH 4/4] delete comment --- pandas/core/arrays/datetimes.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/core/arrays/datetimes.py b/pandas/core/arrays/datetimes.py index 39f563d777ea0..0581bff0bf698 100644 --- a/pandas/core/arrays/datetimes.py +++ b/pandas/core/arrays/datetimes.py @@ -2398,7 +2398,6 @@ def generate_range(start=None, end=None, periods=None, offset=BDay()): elif end and not offset.is_on_offset(end): end = offset.rollback(end) - # fix issues be metioned at #35342 end = Timestamp(str(end).split(' ')[0] + ' 23:59:59') if periods is None and end < start and offset.n >= 0: