Skip to content

BUG: Return type discrepancy in USFederalHolidayCalendar #49118

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
mroeschke merged 43 commits into from
Nov 2, 2022
Merged

BUG: Return type discrepancy in USFederalHolidayCalendar #49118

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
8281084
GH49075 looks weird. Let's add a test and go from there.
roadswitcher Oct 15, 2022
8d1b868
Some cleanup.
roadswitcher Oct 15, 2022
eb5c8a8
First pass at the fix.
roadswitcher Oct 15, 2022
b00c83f
Missed a space, failed formatting check.
roadswitcher Oct 15, 2022
1720600
pre-commit would have caught that, eh.
roadswitcher Oct 15, 2022
d87891f
Missed a spot.
roadswitcher Oct 15, 2022
ad0a017
Update test_federal.py
roadswitcher Oct 15, 2022
d8e9f9d
Merge branch 'pandas-dev:main' into odd_calendar_behavior
roadswitcher Oct 16, 2022
c07f068
Well, that was subtle.
roadswitcher Oct 16, 2022
b423bb7
Changed the test.
roadswitcher Oct 16, 2022
9f89326
Git mistake.
roadswitcher Oct 16, 2022
992143c
Backing away from keyboard now.
roadswitcher Oct 16, 2022
8e516f3
Merge branch 'pandas-dev:main' into odd_calendar_behavior
roadswitcher Oct 29, 2022
7486888
next: write more tests.
roadswitcher Oct 29, 2022
d63ea70
precommit local run.
roadswitcher Oct 29, 2022
e40ce4d
User specified half-open date intervals can return inconsistent results.
roadswitcher Oct 29, 2022
c953651
Added logic to close open time intervals into AbstractHolidayCalender
roadswitcher Oct 30, 2022
68f8db4
OK, I've learned pre-commit doesn't pass wildcards all the way down a…
roadswitcher Oct 30, 2022
344238e
Merge branch 'pandas-dev:main' into odd_calendar_behavior
roadswitcher Oct 30, 2022
3172392
Ensure DatetimeIndex returned in _apply_rule
roadswitcher Oct 30, 2022
824abb6
Merge branch 'odd_calendar_behavior' of github.com:roadswitcher/panda…
roadswitcher Oct 30, 2022
cb6ab53
Ensure DatetimeIndex returned in _apply_rule
roadswitcher Oct 30, 2022
b865481
Caught formatting.
roadswitcher Oct 30, 2022
0c8e325
Missed running isort locally.
roadswitcher Oct 30, 2022
718daa0
Merge branch 'main' into odd_calendar_behavior
roadswitcher Oct 30, 2022
5aca82d
Well, that was subtle.
roadswitcher Nov 1, 2022
c6b2d5b
Changed URL to current OPM source-of-record, updated whatsnew
roadswitcher Nov 1, 2022
da6c1a3
Merge branch 'main' into odd_calendar_behavior
roadswitcher Nov 1, 2022
a8a6244
Update v2.0.0.rst
roadswitcher Nov 1, 2022
ec087a3
Add dtype to empty index ( caught by mypy in CI, not part of pre-comm…
roadswitcher Nov 1, 2022
a6242a9
Updated holiday.py
roadswitcher Nov 1, 2022
8922123
... and forgot to pre-commit run black
roadswitcher Nov 1, 2022
592f705
Merge branch 'main' into odd_calendar_behavior
roadswitcher Nov 1, 2022
cd848c1
Merge branch 'main' into odd_calendar_behavior
roadswitcher Nov 1, 2022
a502a06
Update pandas/tseries/holiday.py
roadswitcher Nov 1, 2022
67c83b8
Update v2.0.0.rst
roadswitcher Nov 1, 2022
1ae7c11
Merge branch 'main' into odd_calendar_behavior
roadswitcher Nov 1, 2022
6188c80
Added test to test_federal.py to ensure comparison against known-good…
roadswitcher Nov 1, 2022
4283115
Add change to test_federal to compare against constructed DatetimeInd…
roadswitcher Nov 2, 2022
6122af8
Merge branch 'main' into odd_calendar_behavior
roadswitcher Nov 2, 2022
ad311f0
Merge branch 'main' into odd_calendar_behavior
roadswitcher Nov 2, 2022
176f3e3
Merge branch 'main' into odd_calendar_behavior
roadswitcher Nov 2, 2022
45521a7
Update doc/source/whatsnew/v2.0.0.rst
mroeschke Nov 2, 2022
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
Prev Previous commit
Next Next commit
Well, that was subtle.
  • Loading branch information
@roadswitcher
roadswitcher committed Oct 16, 2022
commit c07f068f76bfc817defd44093ccf88b44f6edbcc
15 changes: 7 additions & 8 deletions pandas/tseries/holiday.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,13 +532,6 @@ def merge(self, other, inplace: bool = False):
USColumbusDay = Holiday(
"Columbus Day", month=10, day=1, offset=DateOffset(weekday=MO(2))
)
USJuneteenthIndepedence = Holiday(
"Juneteenth National Independence Day",
start_date=datetime(2021, 6, 18),
month=6,
day=19,
observance=nearest_workday,
)
USThanksgivingDay = Holiday(
"Thanksgiving Day", month=11, day=1, offset=DateOffset(weekday=TH(4))
)
Expand Down Expand Up @@ -569,7 +562,13 @@ class USFederalHolidayCalendar(AbstractHolidayCalendar):
USMartinLutherKingJr,
USPresidentsDay,
USMemorialDay,
USJuneteenthIndepedence,
Holiday(
"Juneteenth National Independence Day",
month=6,
day=19,
start_date="2021-06-18",
observance=nearest_workday,
),
Holiday("Independence Day", month=7, day=4, observance=nearest_workday),
USLaborDay,
USColumbusDay,
Expand Down