Skip to content

Implement confirmed years range support for custom calendars #2759

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 8 commits into from
Aug 7, 2025
Merged

Implement confirmed years range support for custom calendars #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1e072e
Add checked year range support for custom calendars
KJhellico Jul 26, 2025
4dab8e7
Merge branch 'dev' into add-checked-range
KJhellico Jul 31, 2025
e87e856
PR suggestions
KJhellico Jul 31, 2025
0b6d6e2
Rename
KJhellico Jul 31, 2025
d993b84
Update code
arkid15r Aug 4, 2025
4f000f3
Merge branch 'dev' into add-checked-range
KJhellico Aug 5, 2025
6ab8a76
Update countries
KJhellico Aug 1, 2025
6f1851b
Update Chinese calendar
KJhellico Aug 5, 2025
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
18 changes: 14 additions & 4 deletions holidays/calendars/chinese.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,11 +1325,21 @@ def __verify_calendar(calendar):
def _get_holiday(self, holiday: str, year: int, calendar=None) -> tuple[Optional[date], bool]:
calendar = calendar or self.__calendar
self.__verify_calendar(calendar)
custom_calendar_dates = getattr(self, f"{calendar}_{holiday}_DATES", {})
confirmed_dates = getattr(
self, f"{holiday}_DATES_{_CustomCalendar.CUSTOM_ATTR_POSTFIX}", {}
)
confirmed_years = getattr(
self, f"{holiday}_DATES_CONFIRMED_YEARS_{_CustomCalendar.CUSTOM_ATTR_POSTFIX}", (0, 0)
)
estimated_dates = getattr(self, f"{holiday}_DATES", {})
exact_dates = getattr(self, f"{holiday}_DATES_{_CustomCalendar.CUSTOM_ATTR_POSTFIX}", {})
dt = exact_dates.get(year, custom_calendar_dates.get(year, estimated_dates.get(year, ())))
return date(year, *dt) if dt else None, year not in exact_dates
custom_calendar_dates = getattr(self, f"{calendar}_{holiday}_DATES", {})
dt = confirmed_dates.get(
year, custom_calendar_dates.get(year, estimated_dates.get(year, ()))
)
is_confirmed = year in confirmed_dates or (
confirmed_years[0] <= year <= confirmed_years[1]
)
return date(year, *dt) if dt else None, not is_confirmed

def buddha_birthday_date(self, year: int, calendar=None) -> tuple[Optional[date], bool]:
return self._get_holiday(BUDDHA_BIRTHDAY, year, calendar)
Expand Down
20 changes: 16 additions & 4 deletions holidays/calendars/islamic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3971,11 +3971,23 @@ class _IslamicLunar:
}

def _get_holiday(self, holiday: str, year: int) -> Iterable[tuple[date, bool]]:
confirmed_dates = getattr(
self, f"{holiday}_DATES_{_CustomCalendar.CUSTOM_ATTR_POSTFIX}", {}
)
confirmed_years = getattr(
self, f"{holiday}_DATES_CONFIRMED_YEARS_{_CustomCalendar.CUSTOM_ATTR_POSTFIX}", ()
)
estimated_dates = getattr(self, f"{holiday}_DATES", {})
exact_dates = getattr(self, f"{holiday}_DATES_{_CustomCalendar.CUSTOM_ATTR_POSTFIX}", {})
for year in (year - 1, year):
for dt in _normalize_tuple(exact_dates.get(year, estimated_dates.get(year, ()))):
yield date(year, *dt), year not in exact_dates

for check_year in (year - 1, year):
for dt in _normalize_tuple(
confirmed_dates.get(check_year, estimated_dates.get(check_year, ()))
):
is_confirmed = check_year in confirmed_dates or any(
year_from <= check_year <= year_to
for year_from, year_to in _normalize_tuple(confirmed_years)
)
yield date(check_year, *dt), not is_confirmed

def _is_long_ramadan(self, eid_al_fitr: date) -> bool:
"""Check whether the Ramadan preceding the given Eid al-Fitr date lasted 30 days.
Expand Down
45 changes: 6 additions & 39 deletions holidays/countries/afghanistan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,7 @@
from gettext import gettext as tr

from holidays.calendars import _CustomIslamicHolidays
from holidays.calendars.gregorian import (
JAN,
MAR,
APR,
MAY,
JUN,
JUL,
AUG,
SEP,
OCT,
NOV,
DEC,
FRI,
SAT,
)
from holidays.calendars.gregorian import JAN, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC, FRI, SAT
from holidays.groups import InternationalHolidays, IslamicHolidays, PersianCalendarHolidays
from holidays.holiday_base import HolidayBase

Expand Down Expand Up @@ -134,8 +120,8 @@ class AFG(Afghanistan):


class AfghanistanIslamicHolidays(_CustomIslamicHolidays):
ASHURA_DATES_CONFIRMED_YEARS = (2014, 2021)
ASHURA_DATES = {
2014: (NOV, 3),
2015: (OCT, 24),
2016: (OCT, 12),
2017: (OCT, 1),
Expand All @@ -145,58 +131,39 @@ class AfghanistanIslamicHolidays(_CustomIslamicHolidays):
2021: (AUG, 19),
}

EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2014, 2024)
EID_AL_ADHA_DATES = {
2014: (OCT, 5),
2015: (SEP, 23),
2016: (SEP, 13),
2017: (SEP, 2),
2018: (AUG, 22),
2019: (AUG, 11),
2020: (JUL, 31),
2021: (JUL, 20),
2022: (JUL, 9),
2023: (JUN, 28),
2024: (JUN, 17),
}

EID_AL_FITR_DATES_CONFIRMED_YEARS = (2014, 2024)
EID_AL_FITR_DATES = {
2014: (JUL, 29),
2015: (JUL, 18),
2016: (JUL, 7),
2017: (JUN, 26),
2018: (JUN, 15),
2019: (JUN, 4),
2020: (MAY, 24),
2021: (MAY, 13),
2022: (MAY, 1),
2023: (APR, 22),
2024: (APR, 10),
}

MAWLID_DATES_CONFIRMED_YEARS = (2014, 2024)
MAWLID_DATES = {
2014: (JAN, 14),
2015: ((JAN, 3), (DEC, 24)),
2016: (DEC, 12),
2017: (DEC, 1),
2018: (NOV, 21),
2019: (NOV, 10),
2020: (OCT, 29),
2021: (OCT, 19),
2022: (OCT, 8),
2023: (SEP, 27),
2024: (SEP, 16),
}

RAMADAN_BEGINNING_DATES_CONFIRMED_YEARS = (2014, 2024)
RAMADAN_BEGINNING_DATES = {
2014: (JUN, 29),
2015: (JUN, 18),
2016: (JUN, 7),
2017: (MAY, 27),
2018: (MAY, 16),
2019: (MAY, 6),
2020: (APR, 24),
2021: (APR, 13),
2022: (APR, 2),
2023: (MAR, 23),
2024: (MAR, 11),
}
25 changes: 3 additions & 22 deletions holidays/countries/albania.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from gettext import gettext as tr

from holidays.calendars import _CustomIslamicHolidays
from holidays.calendars.gregorian import JAN, MAR, APR, MAY, JUN, JUL, AUG
from holidays.calendars.gregorian import JAN, MAR
from holidays.calendars.julian import JULIAN_CALENDAR
from holidays.groups import (
ChristianHolidays,
Expand Down Expand Up @@ -133,27 +133,8 @@ class ALB(Albania):


class AlbaniaIslamicHolidays(_CustomIslamicHolidays):
EID_AL_ADHA_DATES = {
2018: (AUG, 21),
2019: (AUG, 11),
2020: (JUL, 31),
2021: (JUL, 20),
2022: (JUL, 9),
2023: (JUN, 28),
2024: (JUN, 16),
2025: (JUN, 6),
}

EID_AL_FITR_DATES = {
2018: (JUN, 15),
2019: (JUN, 4),
2020: (MAY, 24),
2021: (MAY, 13),
2022: (MAY, 2),
2023: (APR, 21),
2024: (APR, 10),
2025: (MAR, 30),
}
EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2018, 2025)
EID_AL_FITR_DATES_CONFIRMED_YEARS = (2018, 2025)


class AlbaniaStaticHolidays:
Expand Down
21 changes: 3 additions & 18 deletions holidays/countries/argentina.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,34 +778,19 @@ class ARG(Argentina):


class ArgentinaIslamicHolidays(_CustomIslamicHolidays):
EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2019, 2025)
EID_AL_ADHA_DATES = {
2019: (AUG, 11),
2020: (JUL, 31),
2021: (JUL, 20),
2022: (JUL, 9),
2023: (JUN, 28),
2024: (JUN, 16),
2025: (JUN, 10),
}

EID_AL_FITR_DATES_CONFIRMED_YEARS = (2019, 2025)
EID_AL_FITR_DATES = {
2019: (JUN, 4),
2020: (MAY, 24),
2021: (MAY, 13),
2022: (MAY, 2),
2023: (APR, 21),
2024: (APR, 10),
2025: (MAR, 31),
}

HIJRI_NEW_YEAR_DATES_CONFIRMED_YEARS = (2019, 2025)
HIJRI_NEW_YEAR_DATES = {
2019: (AUG, 31),
2020: (AUG, 20),
2021: (AUG, 8),
2022: (JUL, 30),
2023: (JUL, 19),
2024: (JUL, 7),
2025: (JUN, 26),
}


Expand Down
37 changes: 2 additions & 35 deletions holidays/countries/azerbaijan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,58 +206,25 @@ class AZE(Azerbaijan):


class AzerbaijanIslamicHolidays(_CustomIslamicHolidays):
EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2002, 2025)
EID_AL_ADHA_DATES = {
2002: (FEB, 21),
2003: (FEB, 11),
2004: (FEB, 1),
2005: (JAN, 22),
2006: ((JAN, 10), (DEC, 31)),
2007: (DEC, 20),
2008: (DEC, 8),
2009: (NOV, 27),
2010: (NOV, 16),
2011: (NOV, 6),
2012: (OCT, 25),
2013: (OCT, 15),
2014: (OCT, 4),
2015: (SEP, 24),
2016: (SEP, 12),
2017: (SEP, 1),
2018: (AUG, 22),
2019: (AUG, 12),
2020: (JUL, 31),
2021: (JUL, 20),
2022: (JUL, 9),
2023: (JUN, 28),
2024: (JUN, 16),
2025: (JUN, 6),
}

EID_AL_FITR_DATES_CONFIRMED_YEARS = (2002, 2025)
EID_AL_FITR_DATES = {
2002: (DEC, 4),
2003: (NOV, 25),
2004: (NOV, 14),
2005: (NOV, 3),
2006: (OCT, 23),
2007: (OCT, 12),
2008: (SEP, 30),
2009: (SEP, 20),
2010: (SEP, 9),
2011: (AUG, 30),
2012: (AUG, 19),
2013: (AUG, 8),
2014: (JUL, 28),
2015: (JUL, 17),
2016: (JUL, 6),
2017: (JUN, 26),
2018: (JUN, 15),
2019: (JUN, 5),
2020: (MAY, 24),
2021: (MAY, 13),
2022: (MAY, 2),
2023: (APR, 21),
2024: (APR, 10),
2025: (MAR, 30),
}


Expand Down
25 changes: 5 additions & 20 deletions holidays/countries/bahrain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from gettext import gettext as tr

from holidays.calendars import _CustomIslamicHolidays
from holidays.calendars.gregorian import FRI, SAT, MAY, JUL, AUG, OCT
from holidays.calendars.gregorian import FRI, SAT
from holidays.groups import InternationalHolidays, IslamicHolidays
from holidays.holiday_base import HolidayBase

Expand Down Expand Up @@ -92,22 +92,7 @@ class BAH(Bahrain):


class BahrainIslamicHolidays(_CustomIslamicHolidays):
ASHURA_DATES = {
2022: (AUG, 8),
}

EID_AL_ADHA = {
2022: (JUL, 9),
}

EID_AL_FITR_DATES = {
2022: (MAY, 2),
}

HIJRI_NEW_YEAR_DATES = {
2022: (JUL, 30),
}

MAWLID_DATES = {
2022: (OCT, 8),
}
ASHURA_DATES_CONFIRMED_YEARS = (2022, 2022)
EID_AL_FITR_DATES_CONFIRMED_YEARS = (2022, 2022)
HIJRI_NEW_YEAR_DATES_CONFIRMED_YEARS = (2022, 2022)
MAWLID_DATES_CONFIRMED_YEARS = (2022, 2022)
29 changes: 2 additions & 27 deletions holidays/countries/bosnia_and_herzegovina.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,8 @@
from holidays.calendars import _CustomIslamicHolidays
from holidays.calendars.gregorian import (
GREGORIAN_CALENDAR,
JAN,
FEB,
MAR,
APR,
MAY,
JUN,
JUL,
AUG,
Expand Down Expand Up @@ -259,55 +256,33 @@ class BIH(BosniaAndHerzegovina):


class BosniaAndHerzegovinaIslamicHolidays(_CustomIslamicHolidays):
EID_AL_ADHA_DATES_CONFIRMED_YEARS = (2001, 2023)
EID_AL_ADHA_DATES = {
2001: (MAR, 6),
2002: (FEB, 23),
2003: (FEB, 12),
2004: (FEB, 2),
2005: (JAN, 21),
2006: ((JAN, 10), (DEC, 31)),
2007: (DEC, 20),
2008: (DEC, 9),
2009: (NOV, 28),
2010: (NOV, 17),
2011: (NOV, 7),
2012: (OCT, 26),
2013: (OCT, 15),
2014: (OCT, 4),
2015: (SEP, 24),
2016: (SEP, 13),
2017: (SEP, 2),
2018: (AUG, 22),
2019: (AUG, 11),
2020: (JUL, 31),
2021: (JUL, 20),
2022: (JUL, 9),
2023: (JUN, 28),
}

EID_AL_FITR_DATES_CONFIRMED_YEARS = (2001, 2024)
EID_AL_FITR_DATES = {
2001: (DEC, 17),
2002: (DEC, 6),
2003: (NOV, 26),
2004: (NOV, 14),
2005: (NOV, 4),
2006: (OCT, 24),
2007: (OCT, 13),
2008: (OCT, 2),
2009: (SEP, 21),
2010: (SEP, 10),
2011: (AUG, 31),
2012: (AUG, 19),
2013: (AUG, 8),
2014: (JUL, 28),
2015: (JUL, 18),
2016: (JUL, 7),
2017: (JUN, 26),
2018: (JUN, 15),
2019: (JUN, 4),
2020: (MAY, 24),
2021: (MAY, 13),
2022: (MAY, 2),
2023: (APR, 21),
2024: (APR, 10),
}
Loading
Loading