Clean up calendars

holidays/calendars/__init__.py

@@ -17,12 +17,9 @@
 from holidays.calendars.buddhist import _CustomBuddhistCalendar, _BuddhistLunisolar
 from holidays.calendars.chinese import _CustomChineseCalendar, _ChineseLunisolar
 from holidays.calendars.custom import _CustomCalendar
+from holidays.calendars.gregorian import GREGORIAN_CALENDAR
 from holidays.calendars.hebrew import _HebrewLunisolar
 from holidays.calendars.hindu import _HinduLunisolar, _CustomHinduCalendar
 from holidays.calendars.islamic import _CustomIslamicCalendar, _IslamicLunar
-from holidays.calendars.thai import _ThaiLunisolar
-
-GREGORIAN_CALENDAR = "GREGORIAN_CALENDAR"
-JULIAN_CALENDAR = "JULIAN_CALENDAR"
-KHMER_CALENDAR = "KHMER_CALENDAR"
-THAI_CALENDAR = "THAI_CALENDAR"
+from holidays.calendars.julian import JULIAN_CALENDAR
+from holidays.calendars.thai import _ThaiLunisolar, KHMER_CALENDAR, THAI_CALENDAR

holidays/calendars/buddhist.py

@@ -13,7 +13,7 @@
 from typing import Optional, Tuple
 
 from holidays.calendars.custom import _CustomCalendar
-from holidays.constants import MAY, JUN
+from holidays.calendars.gregorian import MAY, JUN
 
 VESAK = "VESAK"
 VESAK_MAY = "VESAK_MAY"

holidays/calendars/chinese.py

@@ -13,7 +13,7 @@
 from typing import Optional, Tuple
 
 from holidays.calendars.custom import _CustomCalendar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, SEP, OCT, NOV
+from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, SEP, OCT, NOV
 
 BUDDHA_BIRTHDAY = "BUDDHA_BIRTHDAY"
 DOUBLE_NINTH = "DOUBLE_NINTH"

holidays/calendars/gregorian.py

@@ -0,0 +1,17 @@
+#  python-holidays
+#  ---------------
+#  A fast, efficient Python library for generating country, province and state
+#  specific sets of holidays on the fly. It aims to make determining whether a
+#  specific date is a holiday as fast and flexible as possible.
+#
+#  Authors: dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/dr-prodigy/python-holidays
+#  License: MIT (see LICENSE file)
+
+GREGORIAN_CALENDAR = "GREGORIAN_CALENDAR"
+
+MON, TUE, WED, THU, FRI, SAT, SUN = range(7)
+WEEKEND = (SAT, SUN)
+
+JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC = range(1, 13)

holidays/calendars/hebrew.py

@@ -12,7 +12,7 @@
 from datetime import date
 from typing import Optional
 
-from holidays.constants import FEB, MAR, APR, MAY, JUN, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import FEB, MAR, APR, MAY, JUN, SEP, OCT, NOV, DEC
 
 
 class _HebrewLunisolar:

holidays/calendars/hindu.py

@@ -13,7 +13,7 @@
 from typing import Optional, Tuple
 
 from holidays.calendars.custom import _CustomCalendar
-from holidays.constants import JAN, FEB, MAR, OCT, NOV
+from holidays.calendars.gregorian import JAN, FEB, MAR, OCT, NOV
 
 DIWALI = "DIWALI"
 THAIPUSAM = "THAIPUSAM"

holidays/calendars/islamic.py

@@ -13,7 +13,7 @@
 from typing import Iterable, Tuple
 
 from holidays.calendars.custom import _CustomCalendar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.helpers import _normalize_tuple
 
 ASHURA = "ASHURA"

holidays/calendars/julian.py

@@ -0,0 +1,12 @@
+#  python-holidays
+#  ---------------
+#  A fast, efficient Python library for generating country, province and state
+#  specific sets of holidays on the fly. It aims to make determining whether a
+#  specific date is a holiday as fast and flexible as possible.
+#
+#  Authors: dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/dr-prodigy/python-holidays
+#  License: MIT (see LICENSE file)
+
+JULIAN_CALENDAR = "JULIAN_CALENDAR"

holidays/calendars/thai.py

@@ -14,7 +14,6 @@
 from functools import lru_cache
 from typing import Optional
 
-# Manual Assign to avoid circular import
 KHMER_CALENDAR = "KHMER_CALENDAR"
 THAI_CALENDAR = "THAI_CALENDAR"
 

holidays/constants.py

@@ -9,12 +9,32 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-HOLIDAY_NAME_DELIMITER = "; "  # Holiday names separator.
+# flake8: noqa: F401
 
-MON, TUE, WED, THU, FRI, SAT, SUN = range(7)
-WEEKEND = (SAT, SUN)
+from holidays.calendars.gregorian import (
+    JAN,
+    FEB,
+    MAR,
+    APR,
+    MAY,
+    JUN,
+    JUL,
+    AUG,
+    SEP,
+    OCT,
+    NOV,
+    DEC,
+    MON,
+    TUE,
+    WED,
+    THU,
+    FRI,
+    SAT,
+    SUN,
+    WEEKEND,
+)
 
-JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC = range(1, 13)
+HOLIDAY_NAME_DELIMITER = "; "  # Holiday names separator.
 
 # Supported holiday categories.
 BANK = "bank"

holidays/countries/albania.py

@@ -11,8 +11,8 @@
 
 from datetime import timedelta as td
 
-from holidays.calendars import JULIAN_CALENDAR
-from holidays.constants import JAN, MAR, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import JAN, MAR, SEP, OCT, NOV, DEC
+from holidays.calendars.julian import JULIAN_CALENDAR
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, IslamicHolidays, InternationalHolidays
 

holidays/countries/algeria.py

@@ -1,4 +1,4 @@
-from holidays.constants import JAN, JUL, NOV
+from holidays.calendars.gregorian import JAN, JUL, NOV
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import IslamicHolidays, InternationalHolidays
 

holidays/countries/andorra.py

@@ -11,7 +11,7 @@
 
 from datetime import timedelta as td
 
-from holidays.constants import MAR, JUL, AUG, SEP, FRI, SAT
+from holidays.calendars.gregorian import MAR, JUL, AUG, SEP, FRI, SAT
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/angola.py

@@ -11,7 +11,7 @@
 
 from datetime import timedelta as td
 
-from holidays.constants import FEB, MAR, APR, SEP, NOV, DEC
+from holidays.calendars.gregorian import FEB, MAR, APR, SEP, NOV, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/argentina.py

@@ -12,7 +12,21 @@
 from datetime import date
 from gettext import gettext as tr
 
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC, MON
+from holidays.calendars.gregorian import (
+    JAN,
+    FEB,
+    MAR,
+    APR,
+    MAY,
+    JUN,
+    JUL,
+    AUG,
+    SEP,
+    OCT,
+    NOV,
+    DEC,
+    MON,
+)
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/armenia.py

@@ -11,8 +11,8 @@
 
 from gettext import gettext as tr
 
-from holidays.calendars import JULIAN_CALENDAR
-from holidays.constants import JAN, APR, MAY, JUL, SEP
+from holidays.calendars.gregorian import JAN, APR, MAY, JUL, SEP
+from holidays.calendars.julian import JULIAN_CALENDAR
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/aruba.py

@@ -13,7 +13,7 @@
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from holidays.constants import JAN, MAR, APR, AUG
+from holidays.calendars.gregorian import JAN, MAR, APR, AUG
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/australia.py

@@ -12,7 +12,7 @@
 from datetime import date
 from datetime import timedelta as td
 
-from holidays.constants import JAN, MAR, APR, MAY, JUN, AUG, SEP, OCT, NOV, MON, TUE, FRI
+from holidays.calendars.gregorian import JAN, MAR, APR, MAY, JUN, AUG, SEP, OCT, NOV, MON, TUE, FRI
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/austria.py

@@ -11,7 +11,8 @@
 
 from gettext import gettext as tr
 
-from holidays.constants import OCT, NOV, BANK, PUBLIC
+from holidays.calendars.gregorian import OCT, NOV
+from holidays.constants import BANK, PUBLIC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/azerbaijan.py

@@ -13,7 +13,7 @@
 from datetime import timedelta as td
 
 from holidays.calendars import _CustomIslamicCalendar
-from holidays.constants import JAN, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import JAN, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import InternationalHolidays, IslamicHolidays
 

holidays/countries/bahrain.py

@@ -10,7 +10,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.calendars import _CustomIslamicCalendar
-from holidays.constants import FRI, SAT, MAY, JUL, AUG, OCT, DEC
+from holidays.calendars.gregorian import FRI, SAT, MAY, JUL, AUG, OCT, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import InternationalHolidays, IslamicHolidays
 

holidays/countries/bangladesh.py

@@ -12,7 +12,7 @@
 
 from datetime import date
 
-from holidays.constants import FEB, MAR, APR, MAY, AUG, DEC
+from holidays.calendars.gregorian import FEB, MAR, APR, MAY, AUG, DEC
 from holidays.holiday_base import HolidayBase
 
 

holidays/countries/belarus.py

@@ -11,8 +11,8 @@
 
 from gettext import gettext as tr
 
-from holidays.calendars import GREGORIAN_CALENDAR, JULIAN_CALENDAR
-from holidays.constants import JUL, NOV
+from holidays.calendars.gregorian import GREGORIAN_CALENDAR, JUL, NOV
+from holidays.calendars.julian import JULIAN_CALENDAR
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/belgium.py

@@ -14,7 +14,7 @@
 
 from dateutil.easter import easter
 
-from holidays.constants import JAN, MAY, JUL, AUG, NOV, DEC
+from holidays.calendars.gregorian import JAN, MAY, JUL, AUG, NOV, DEC
 from holidays.holiday_base import HolidayBase
 
 

holidays/countries/belize.py

@@ -13,7 +13,7 @@
 from datetime import timedelta as td
 from typing import Optional
 
-from holidays.constants import JAN, MAR, MAY, AUG, SEP, OCT, NOV, MON
+from holidays.calendars.gregorian import JAN, MAR, MAY, AUG, SEP, OCT, NOV, MON
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/bolivia.py

@@ -12,7 +12,7 @@
 
 from datetime import timedelta as td
 
-from holidays.constants import JAN, APR, MAY, JUN, JUL, AUG, SEP, NOV
+from holidays.calendars.gregorian import JAN, APR, MAY, JUN, JUL, AUG, SEP, NOV
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/bosnia_and_herzegovina.py

@@ -14,7 +14,9 @@
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from holidays.calendars import _CustomIslamicCalendar, GREGORIAN_CALENDAR, JULIAN_CALENDAR
+from holidays.calendars import _CustomIslamicCalendar
+from holidays.calendars.gregorian import GREGORIAN_CALENDAR
+from holidays.calendars.julian import JULIAN_CALENDAR
 from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, IslamicHolidays, InternationalHolidays

holidays/countries/botswana.py

@@ -12,7 +12,7 @@
 from datetime import date
 from datetime import timedelta as td
 
-from holidays.constants import JUL, SEP, MON
+from holidays.calendars.gregorian import JUL, SEP, MON
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/brazil.py

@@ -12,7 +12,22 @@
 from datetime import timedelta as td
 from datetime import date
 
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC, FRI, SUN
+from holidays.calendars.gregorian import (
+    JAN,
+    FEB,
+    MAR,
+    APR,
+    MAY,
+    JUN,
+    JUL,
+    AUG,
+    SEP,
+    OCT,
+    NOV,
+    DEC,
+    FRI,
+    SUN,
+)
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/brunei.py

@@ -14,7 +14,7 @@
 from gettext import gettext as tr
 
 from holidays.calendars import _CustomIslamicCalendar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import (
     ChineseCalendarHolidays,

holidays/countries/bulgaria.py

@@ -14,7 +14,7 @@
 
 from dateutil.easter import EASTER_ORTHODOX, easter
 
-from holidays.constants import JAN, MAR, MAY, SEP, NOV, DEC
+from holidays.calendars.gregorian import JAN, MAR, MAY, SEP, NOV, DEC
 from holidays.holiday_base import HolidayBase
 
 

holidays/countries/burkina_faso.py

@@ -13,7 +13,7 @@
 from datetime import timedelta as td
 
 from holidays.calendars import _CustomIslamicCalendar
-from holidays.constants import JAN, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import JAN, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays, IslamicHolidays
 

holidays/countries/burundi.py

@@ -13,7 +13,7 @@
 from datetime import timedelta as td
 from typing import Optional
 
-from holidays.constants import FEB, APR, JUN, JUL, OCT
+from holidays.calendars.gregorian import FEB, APR, JUN, JUL, OCT
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, IslamicHolidays, InternationalHolidays
 

holidays/countries/cambodia.py

@@ -12,8 +12,8 @@
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from holidays.calendars import KHMER_CALENDAR
-from holidays.constants import JAN, APR, MAY, JUN, AUG, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import JAN, APR, MAY, JUN, AUG, SEP, OCT, NOV, DEC
+from holidays.calendars.thai import KHMER_CALENDAR
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import InternationalHolidays, ThaiCalendarHolidays
 

holidays/countries/cameroon.py

@@ -12,7 +12,7 @@
 from datetime import timedelta as td
 
 from holidays.calendars import _CustomIslamicCalendar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
+from holidays.calendars.gregorian import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays, IslamicHolidays