holidays 0.26__py3-none-any.whl → 0.27__py3-none-any.whl

holidays/countries/norway.py

@@ -99,9 +99,7 @@ class Norway(HolidayBase, ChristianHolidays, InternationalHolidays):
             # Optionally add all Sundays of the year.
             begin = _get_nth_weekday_of_month(1, SUN, JAN, year)
             end = date(year, DEC, 31)
-            for dt in (
-                begin + td(days=n) for n in range(0, (end - begin).days + 1, 7)
-            ):
+            for dt in (begin + td(days=n) for n in range(0, (end - begin).days + 1, 7)):
                 # Sunday.
                 self._add_holiday(tr("Søndag"), dt)
 

holidays/countries/pakistan.py

@@ -10,8 +10,7 @@
 #  License: MIT (see LICENSE file)
 
 from holidays.calendars import _CustomIslamicCalendar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC
+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 InternationalHolidays, IslamicHolidays
 
@@ -81,88 +80,88 @@ class PakistanIslamicCalendar(_CustomIslamicCalendar):
     # https://www.timeanddate.com/holidays/pakistan/first-day-ashura
 
     ASHURA_DATES = {
-        2005: ((FEB, 18),),
-        2006: ((FEB, 8),),
-        2007: ((JAN, 28),),
-        2008: ((JAN, 18),),
+        2005: (FEB, 18),
+        2006: (FEB, 8),
+        2007: (JAN, 28),
+        2008: (JAN, 18),
         2009: ((JAN, 6), (DEC, 26)),
-        2010: ((DEC, 16),),
-        2011: ((DEC, 5),),
-        2012: ((NOV, 23),),
-        2013: ((NOV, 13),),
-        2014: ((NOV, 3),),
-        2015: ((OCT, 23),),
-        2016: ((OCT, 11),),
-        2017: ((SEP, 30),),
-        2018: ((SEP, 21),),
-        2019: ((SEP, 9),),
-        2020: ((AUG, 29),),
-        2021: ((AUG, 18),),
-        2022: ((AUG, 9),),
+        2010: (DEC, 16),
+        2011: (DEC, 5),
+        2012: (NOV, 23),
+        2013: (NOV, 13),
+        2014: (NOV, 3),
+        2015: (OCT, 23),
+        2016: (OCT, 11),
+        2017: (SEP, 30),
+        2018: (SEP, 21),
+        2019: (SEP, 9),
+        2020: (AUG, 29),
+        2021: (AUG, 18),
+        2022: (AUG, 9),
     }
 
     # https://www.timeanddate.com/holidays/pakistan/eid-ul-azha
     EID_AL_ADHA_DATES = {
-        2005: ((JAN, 21),),
+        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, 6),),
-        2015: ((SEP, 24),),
-        2016: ((SEP, 12),),
-        2017: ((SEP, 2),),
-        2018: ((AUG, 22),),
-        2019: ((AUG, 12),),
-        2020: ((JUL, 31),),
-        2021: ((JUL, 21),),
-        2022: ((JUL, 10),),
+        2007: (DEC, 20),
+        2008: (DEC, 9),
+        2009: (NOV, 28),
+        2010: (NOV, 17),
+        2011: (NOV, 7),
+        2012: (OCT, 26),
+        2013: (OCT, 15),
+        2014: (OCT, 6),
+        2015: (SEP, 24),
+        2016: (SEP, 12),
+        2017: (SEP, 2),
+        2018: (AUG, 22),
+        2019: (AUG, 12),
+        2020: (JUL, 31),
+        2021: (JUL, 21),
+        2022: (JUL, 10),
     }
 
     # https://www.timeanddate.com/holidays/pakistan/eid-ul-fitr-1
     EID_AL_FITR_DATES = {
-        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, 29),),
-        2015: ((JUL, 17),),
-        2016: ((JUL, 6),),
-        2017: ((JUN, 26),),
-        2018: ((JUN, 16),),
-        2019: ((JUN, 5),),
-        2020: ((MAY, 24),),
-        2021: ((MAY, 13),),
-        2022: ((MAY, 3),),
+        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, 29),
+        2015: (JUL, 17),
+        2016: (JUL, 6),
+        2017: (JUN, 26),
+        2018: (JUN, 16),
+        2019: (JUN, 5),
+        2020: (MAY, 24),
+        2021: (MAY, 13),
+        2022: (MAY, 3),
     }
 
     # https://www.timeanddate.com/holidays/pakistan/eid-milad-un-nabi
     MAWLID_DATES = {
-        2005: ((APR, 22),),
-        2006: ((APR, 11),),
-        2007: ((MAR, 31),),
-        2008: ((MAR, 21),),
-        2009: ((MAR, 9),),
-        2010: ((MAR, 1),),
-        2011: ((FEB, 17),),
-        2012: ((FEB, 5),),
-        2013: ((JAN, 24),),
-        2014: ((JAN, 14),),
-        2015: ((JAN, 4),),
-        2016: ((DEC, 12),),
-        2017: ((DEC, 1),),
-        2018: ((NOV, 21),),
-        2019: ((NOV, 10),),
-        2020: ((OCT, 30),),
-        2021: ((OCT, 19),),
-        2022: ((OCT, 9),),
+        2005: (APR, 22),
+        2006: (APR, 11),
+        2007: (MAR, 31),
+        2008: (MAR, 21),
+        2009: (MAR, 9),
+        2010: (MAR, 1),
+        2011: (FEB, 17),
+        2012: (FEB, 5),
+        2013: (JAN, 24),
+        2014: (JAN, 14),
+        2015: (JAN, 4),
+        2016: (DEC, 12),
+        2017: (DEC, 1),
+        2018: (NOV, 21),
+        2019: (NOV, 10),
+        2020: (OCT, 30),
+        2021: (OCT, 19),
+        2022: (OCT, 9),
     }

holidays/countries/panama.py

@@ -12,13 +12,12 @@
 from datetime import date
 from datetime import timedelta as td
 
-from dateutil.easter import easter
-
-from holidays.constants import JAN, MAY, NOV, DEC
+from holidays.constants import JAN, NOV, DEC
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Panama(HolidayBase):
+class Panama(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     References:
       - https://en.wikipedia.org/wiki/Public_holidays_in_Panama
@@ -27,55 +26,57 @@ class Panama(HolidayBase):
 
     country = "PA"
 
-    def _populate(self, year: int) -> None:
-        def _add_with_observed(hol_date: date, hol_name: str) -> None:
-            self[hol_date] = hol_name
-            if self.observed and self._is_sunday(hol_date):
-                self[hol_date + td(days=+1)] = f"{hol_name} (Observed)"
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
+    def _add_observed(self, dt: date) -> None:
+        if self.observed and self._is_sunday(dt):
+            self._add_holiday("%s (Observed)" % self[dt], dt + td(days=+1))
 
+    def _populate(self, year):
         super()._populate(year)
 
         # New Year's Day
-        _add_with_observed(date(year, JAN, 1), "New Year's Day")
+        self._add_observed(self._add_new_years_day("New Year's Day"))
 
         # Martyrs' Day
-        _add_with_observed(date(year, JAN, 9), "Martyrs' Day")
-
-        easter_date = easter(year)
+        self._add_observed(self._add_holiday("Martyrs' Day", JAN, 9))
 
         # Carnival
-        self[easter_date + td(days=-47)] = "Carnival"
+        self._add_carnival_tuesday("Carnival")
 
         # Good Friday
-        self[easter_date + td(days=-2)] = "Good Friday"
+        self._add_good_friday("Good Friday")
 
         # Labour Day
-        _add_with_observed(date(year, MAY, 1), "Labour Day")
+        self._add_observed(self._add_labor_day("Labour Day"))
 
         # Separation Day
-        self[date(year, NOV, 3)] = "Separation Day"
+        self._add_holiday("Separation Day", NOV, 3)
 
         # National Symbols Day
-        self[date(year, NOV, 4)] = "National Symbols Day"
+        self._add_holiday("National Symbols Day", NOV, 4)
 
         # Colon Day
-        self[date(year, NOV, 5)] = "Colon Day"
+        self._add_holiday("Colon Day", NOV, 5)
 
         # Los Santos Uprising Day
-        self[date(year, NOV, 10)] = "Los Santos Uprising Day"
+        self._add_holiday("Los Santos Uprising Day", NOV, 10)
 
         # Independence Day
-        _add_with_observed(date(year, NOV, 28), "Independence Day")
+        self._add_observed(self._add_holiday("Independence Day", NOV, 28))
 
         # Mother's Day
-        _add_with_observed(date(year, DEC, 8), "Mother's Day")
+        self._add_observed(self._add_holiday("Mother's Day", DEC, 8))
 
         # National Mourning Day
         if year >= 2022:
-            _add_with_observed(date(year, DEC, 20), "National Mourning Day")
+            self._add_observed(self._add_holiday("National Mourning Day", DEC, 20))
 
         # Christmas Day
-        _add_with_observed(date(year, DEC, 25), "Christmas Day")
+        self._add_observed(self._add_christmas_day("Christmas Day"))
 
 
 class PA(Panama):

holidays/countries/paraguay.py

@@ -10,17 +10,14 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from datetime import timedelta as td
 from gettext import gettext as tr
 
-from dateutil.easter import easter
-
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, DEC
+from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, DEC
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Paraguay(HolidayBase):
+class Paraguay(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     https://www.ghp.com.py/news/feriados-nacionales-del-ano-2019-en-paraguay
     https://es.wikipedia.org/wiki/Anexo:D%C3%ADas_feriados_en_Paraguay
@@ -37,10 +34,10 @@ class Paraguay(HolidayBase):
     special_holidays = {
         # public holiday for business purposes, in view of
         # the recently increased risk of Dengue fever
-        2007: ((JAN, 29, public_holiday),),
+        2007: (JAN, 29, public_holiday),
         # public sector holiday to celebrate Paraguay's
         # football team's qualification for the 2010 World Cup
-        2009: ((SEP, 10, public_holiday),),
+        2009: (SEP, 10, public_holiday),
         2010: (
             # public holiday to coincide with the Paraguay-Italy
             # game of the current World Cup
@@ -143,15 +140,20 @@ class Paraguay(HolidayBase):
     }
     supported_languages = ("en_US", "es", "uk")
 
-    def _add_observed_holiday(self, name: str, dt: date) -> None:
-        if self.observed or not self._is_weekend(dt):
-            super()._add_holiday(name, dt)
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
+    def _move_holiday(self, dt: date) -> None:
+        if not self.observed and self._is_weekend(dt):
+            self.pop(dt)
 
     def _populate(self, year):
         super()._populate(year)
 
         # New Year's Day.
-        self._add_observed_holiday(tr("Año Nuevo"), date(year, JAN, 1))
+        self._move_holiday(self._add_new_years_day(tr("Año Nuevo")))
 
         dates_obs = {
             2013: (MAR, 4),
@@ -159,51 +161,51 @@ class Paraguay(HolidayBase):
             2018: (FEB, 26),
             2022: (FEB, 28),
         }
-        # Patriots Day.
         self._add_holiday(
+            # Patriots Day.
             tr("Día de los Héroes de la Patria"),
-            date(year, *dates_obs.get(year, (MAR, 1))),
+            *dates_obs.get(year, (MAR, 1)),
         )
 
-        # Holy Week
-        easter_date = easter(year)
         # Maundy Thursday.
-        self._add_holiday(tr("Jueves Santo"), easter_date + td(days=-3))
+        self._add_holy_thursday(tr("Jueves Santo"))
+
         # Good Friday.
-        self._add_holiday(tr("Viernes Santo"), easter_date + td(days=-2))
+        self._add_good_friday(tr("Viernes Santo"))
+
         # Easter Day.
-        self._add_observed_holiday(tr("Día de Pascuas"), easter_date)
+        self._move_holiday(self._add_easter_sunday(tr("Día de Pascuas")))
 
         # Labour Day.
-        self._add_observed_holiday(
-            tr("Día del Trabajador"), date(year, MAY, 1)
-        )
+        self._move_holiday(self._add_labor_day(tr("Día del Trabajador")))
 
         # Independence Day.
         name = tr("Día de la Independencia Nacional")
-        if year == 2021:
-            self._add_holiday(name, date(year, MAY, 14))
-            self._add_holiday(name, date(year, MAY, 15))
-        elif year >= 2012:
-            self._add_observed_holiday(name, date(year, MAY, 14))
-            self._add_observed_holiday(name, date(year, MAY, 15))
-        else:
-            self._add_observed_holiday(name, date(year, MAY, 15))
+        if year >= 2012:
+            self._move_holiday(self._add_holiday(name, MAY, 14))
+        may_15 = self._add_holiday(name, MAY, 15)
+        if year != 2021:
+            self._move_holiday(may_15)
 
         dates_obs = {
             2014: (JUN, 16),
             2018: (JUN, 11),
         }
-        self._add_observed_holiday(
-            # Chaco Armistice Day.
-            tr("Día de la Paz del Chaco"),
-            date(year, *dates_obs.get(year, (JUN, 12))),
+        self._move_holiday(
+            self._add_holiday(
+                # Chaco Armistice Day.
+                tr("Día de la Paz del Chaco"),
+                *dates_obs.get(year, (JUN, 12)),
+            ),
         )
 
-        self._add_observed_holiday(
-            # Asuncion Foundation's Day.
-            tr("Día de la Fundación de Asunción"),
-            date(year, AUG, 15),
+        self._move_holiday(
+            self._add_holiday(
+                # Asuncion Foundation's Day.
+                tr("Día de la Fundación de Asunción"),
+                AUG,
+                15,
+            ),
         )
 
         if year >= 2000:
@@ -214,20 +216,25 @@ class Paraguay(HolidayBase):
                 2021: (SEP, 27),
                 2022: (OCT, 3),
             }
-            self._add_observed_holiday(
-                # Boqueron Battle Day.
-                tr("Día de la Batalla de Boquerón"),
-                date(year, *dates_obs.get(year, (SEP, 29))),
+            self._move_holiday(
+                self._add_holiday(
+                    # Boqueron Battle Day.
+                    tr("Día de la Batalla de Boquerón"),
+                    *dates_obs.get(year, (SEP, 29)),
+                ),
             )
 
-        self._add_observed_holiday(
-            # Caacupe Virgin Day.
-            tr("Día de la Virgen de Caacupé"),
-            date(year, DEC, 8),
+        self._move_holiday(
+            self._add_holiday(
+                # Caacupe Virgin Day.
+                tr("Día de la Virgen de Caacupé"),
+                DEC,
+                8,
+            )
         )
 
         # Christmas.
-        self._add_holiday(tr("Navidad"), date(year, DEC, 25))
+        self._add_christmas_day(tr("Navidad"))
 
 
 class PY(Paraguay):

holidays/countries/philippines.py

@@ -12,8 +12,12 @@
 from holidays.calendars import _get_nth_weekday_of_month
 from holidays.constants import FEB, APR, JUN, AUG, NOV, DEC, MON
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChineseCalendarHolidays, ChristianHolidays
-from holidays.holiday_groups import InternationalHolidays, IslamicHolidays
+from holidays.holiday_groups import (
+    ChineseCalendarHolidays,
+    ChristianHolidays,
+    InternationalHolidays,
+    IslamicHolidays,
+)
 
 
 class Philippines(

holidays/countries/poland.py

@@ -24,9 +24,7 @@ class Poland(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "PL"
     default_language = "pl"
-    special_holidays = {
-        2018: ((NOV, 12, tr("Narodowe Święto Niepodległości - 100-lecie")),)
-    }
+    special_holidays = {2018: (NOV, 12, tr("Narodowe Święto Niepodległości - 100-lecie"))}
     supported_languages = ("en_US", "pl", "uk")
 
     def __init__(self, *args, **kwargs):
@@ -67,9 +65,7 @@ class Poland(HolidayBase, ChristianHolidays, InternationalHolidays):
 
         if 1946 <= year <= 1950:
             # National Victory and Freedom Day.
-            self._add_holiday(
-                tr("Narodowe Święto Zwycięstwa i Wolności"), MAY, 9
-            )
+            self._add_holiday(tr("Narodowe Święto Zwycięstwa i Wolności"), MAY, 9)
 
         if year <= 1950:
             # Ascension Day.
@@ -100,9 +96,7 @@ class Poland(HolidayBase, ChristianHolidays, InternationalHolidays):
 
         if year <= 1960 or year >= 1989:
             # Assumption of the Virgin Mary.
-            self._add_assumption_of_mary_day(
-                tr("Wniebowzięcie Najświętszej Marii Panny")
-            )
+            self._add_assumption_of_mary_day(tr("Wniebowzięcie Najświętszej Marii Panny"))
 
         # All Saints' Day.
         self._add_all_saints_day(tr("Uroczystość Wszystkich Świętych"))

holidays/countries/portugal.py

@@ -109,15 +109,10 @@ class Portugal(HolidayBase, ChristianHolidays, InternationalHolidays):
             self._add_labor_day(tr("Dia do Trabalhador"))
         if year >= 1911:
             if 1933 <= year <= 1973:
-                self._add_holiday(
-                    tr("Dia de Camões, de Portugal e da Raça"), JUN, 10
-                )
+                self._add_holiday(tr("Dia de Camões, de Portugal e da Raça"), JUN, 10)
             elif year >= 1978:
                 self._add_holiday(
-                    tr(
-                        "Dia de Portugal, de Camões e das Comunidades "
-                        "Portuguesas"
-                    ),
+                    tr("Dia de Portugal, de Camões e das Comunidades Portuguesas"),
                     JUN,
                     10,
                 )
@@ -222,10 +217,7 @@ class Portugal(HolidayBase, ChristianHolidays, InternationalHolidays):
             self._add_holiday(tr("Dia da Região Autónoma da Madeira"), JUL, 1)
         elif self._year >= 1989:
             self._add_holiday(
-                tr(
-                    "Dia da Região Autónoma da Madeira e "
-                    "das Comunidades Madeirenses"
-                ),
+                tr("Dia da Região Autónoma da Madeira e das Comunidades Madeirenses"),
                 JUL,
                 1,
             )

holidays/countries/romania.py

@@ -12,7 +12,7 @@
 from gettext import gettext as tr
 
 from holidays.calendars import GREGORIAN_CALENDAR, JULIAN_CALENDAR
-from holidays.constants import JAN, JUN, NOV, DEC
+from holidays.constants import JAN, NOV, DEC
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
@@ -64,7 +64,7 @@ class Romania(HolidayBase, ChristianHolidays, InternationalHolidays):
 
         if year >= 2017:
             # Children's Day.
-            self._add_holiday(tr("Ziua Copilului"), JUN, 1)
+            self._add_childrens_day(tr("Ziua Copilului"))
 
         # Pentecost.
         name = tr("Rusaliile")
@@ -79,9 +79,7 @@ class Romania(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Law #147/2012
         if year >= 2012:
             # Saint Andrew's Day.
-            self._add_holiday(
-                tr("Sfantul Apostol Andrei cel Intai chemat"), NOV, 30
-            )
+            self._add_holiday(tr("Sfantul Apostol Andrei cel Intai chemat"), NOV, 30)
 
         # National Day.
         self._add_holiday(tr("Ziua Națională a României"), DEC, 1)

holidays/countries/saudi_arabia.py

@@ -36,40 +36,30 @@ class SaudiArabia(HolidayBase, IslamicHolidays):
     country = "SA"
     special_holidays = {
         # celebrate the country's win against Argentina in the World Cup
-        2022: ((NOV, 23, "National Holiday"),),
+        2022: (NOV, 23, "National Holiday"),
     }
 
     def __init__(self, *args, **kwargs):
         IslamicHolidays.__init__(self)
         super().__init__(*args, **kwargs)
 
-    def _add_islamic_observed(
-        self, hol_name: str, hol_dates: Set[date]
-    ) -> None:
+    def _add_islamic_observed(self, hol_name: str, hol_dates: Set[date]) -> None:
         if not self.observed:
             return None
         for dt in hol_dates:
-            weekend_days = sum(
-                self._is_weekend(dt + td(days=i)) for i in range(4)
-            )
+            weekend_days = sum(self._is_weekend(dt + td(days=i)) for i in range(4))
             for i in range(weekend_days):
-                self._add_holiday(
-                    f"{hol_name} (Observed)", dt + td(days=+4 + i)
-                )
+                self._add_holiday(f"{hol_name} (Observed)", dt + td(days=+4 + i))
 
     def _add_observed(self, hol_date: date) -> None:
         if self.observed:
             weekend = sorted(self.weekend)
             # 1st weekend day (Thursday before 2013 and Friday otherwise)
             if hol_date.weekday() == weekend[0]:
-                self._add_holiday(
-                    f"{self[hol_date]} (Observed)", hol_date + td(days=-1)
-                )
+                self._add_holiday(f"{self[hol_date]} (Observed)", hol_date + td(days=-1))
             # 2nd weekend day (Friday before 2013 and Saturday otherwise)
             elif hol_date.weekday() == weekend[1]:
-                self._add_holiday(
-                    f"{self[hol_date]} (Observed)", hol_date + td(days=+1)
-                )
+                self._add_holiday(f"{self[hol_date]} (Observed)", hol_date + td(days=+1))
 
     def _populate(self, year):
         super()._populate(year)
@@ -113,9 +103,7 @@ class SaudiArabia(HolidayBase, IslamicHolidays):
         if year >= 2005:
             dt = date(year, SEP, 23)
             if dt not in self:
-                self._add_observed(
-                    self._add_holiday("National Day Holiday", dt)
-                )
+                self._add_observed(self._add_holiday("National Day Holiday", dt))
 
         # Founding Day holiday (started 2022).
         # Note: if founding day happens within the Eid al-Fitr Holiday or
@@ -123,9 +111,7 @@ class SaudiArabia(HolidayBase, IslamicHolidays):
         if year >= 2022:
             dt = date(year, FEB, 22)
             if dt not in self:
-                self._add_observed(
-                    self._add_holiday("Founding Day Holiday", dt)
-                )
+                self._add_observed(self._add_holiday("Founding Day Holiday", dt))
 
         # observed holidays special cases
         if self.observed and year == 2001: