Skip to content

Update HolidayBase::get_closest_holiday method #3651

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

Open
gaoflow wants to merge 4 commits into
base: dev
Choose a base branch
from
+35 −4
Open

Update HolidayBase::get_closest_holiday method #3651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a37d591
fix: add populated year to years set in get_closest_holiday
gaoflow Jun 25, 2026
33d2910
fix: only auto-populate adjacent years in get_closest_holiday when ex…
gaoflow Jul 15, 2026
d5966a5
chore: apply review suggestions (drop inline comments, us2 -> us_2)
gaoflow Jul 16, 2026
3f9d6f9
Merge branch 'dev' into fix/get-closest-holiday-years-tracking
KJhellico Jul 16, 2026
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
11 changes: 7 additions & 4 deletions holidays/holiday_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,10 +1136,13 @@ def get_closest_holiday(
raise AttributeError(f"Unknown direction: {direction}")

dt = self.__keytransform__(target_date or datetime.now().date())
if direction == "forward" and (next_year := dt.year + 1) not in self.years:
self._populate(next_year)
elif direction == "backward" and (previous_year := dt.year - 1) not in self.years:
self._populate(previous_year)
if self.expand:
if direction == "forward" and (next_year := dt.year + 1) not in self.years:
self.years.add(next_year)
self._populate(next_year)
elif direction == "backward" and (previous_year := dt.year - 1) not in self.years:
self.years.add(previous_year)
self._populate(previous_year)

sorted_dates = sorted(self.keys())
position = (
Expand Down
28 changes: 28 additions & 0 deletions tests/test_holiday_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,6 +1477,34 @@ def test_get_closest_holiday_unsorted_calendars(self):
(date(2024, 1, 15), "Martin Luther King Jr. Day"),
)

def test_get_closest_holiday_updates_years(self):
us = US(years=2024)
self.assertEqual(us.years, {2024})

us.get_closest_holiday(date(2024, 12, 31), "forward")
self.assertIn(2025, us.years)

us_2 = US(years=2024)
self.assertEqual(us_2.years, {2024})

us_2.get_closest_holiday(date(2024, 1, 1), "backward")
self.assertIn(2023, us_2.years)

def test_get_closest_holiday_expand_false_keeps_state(self):
us = US(years=2024, expand=False)
keys_before = set(us.keys())

self.assertIsNone(us.get_closest_holiday(date(2024, 12, 31), "forward"))
self.assertEqual(us.years, {2024})
self.assertEqual(set(us.keys()), keys_before)

self.assertEqual(
us.get_closest_holiday(date(2024, 12, 31), "backward"),
(date(2024, 12, 25), "Christmas Day"),
)
self.assertEqual(us.years, {2024})
self.assertEqual(set(us.keys()), keys_before)

def test_get_closest_holiday_invalid_direction(self):
self.assertRaises(
AttributeError, lambda: HolidayBase().get_closest_holiday(direction="invalid")
Expand Down