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

holidays/countries/united_arab_emirates.py

@@ -9,7 +9,7 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-from holidays.calendars import _CustomCalendar, _IslamicLunar
+from holidays.calendars import _CustomIslamicCalendar
 from holidays.constants import APR, MAY, JUN, JUL, AUG, SEP, NOV, DEC, FRI, SAT
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import InternationalHolidays, IslamicHolidays
@@ -43,9 +43,7 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
 
     def __init__(self, *args, **kwargs):
         InternationalHolidays.__init__(self)
-        IslamicHolidays.__init__(
-            self, calendar=UnitedArabEmiratesIslamicCalendar()
-        )
+        IslamicHolidays.__init__(self, calendar=UnitedArabEmiratesIslamicCalendar())
         super().__init__(*args, **kwargs)
 
     def _populate(self, year):
@@ -56,9 +54,7 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
 
         # Commemoration Day.
         if year >= 2015:
-            self._add_holiday(
-                "Commemoration Day", *((DEC, 1) if year >= 2019 else (NOV, 30))
-            )
+            self._add_holiday("Commemoration Day", *((DEC, 1) if year >= 2019 else (NOV, 30)))
 
         # National Day.
         self._add_holiday("National Day", DEC, 2)
@@ -83,15 +79,11 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
 
         # Leilat al-Miraj.
         if year <= 2018:  # The UAE government removed this starting 2019.
-            self._add_isra_and_miraj_day(
-                "Leilat al-Miraj - The Prophet's ascension"
-            )
+            self._add_isra_and_miraj_day("Leilat al-Miraj - The Prophet's ascension")
 
         # Prophet Muhammad's Birthday.
         if year <= 2019:  # The UAE government removed this starting 2020.
-            self._add_mawlid_day(
-                "Mawlud al-Nabi - Prophet Mohammad's Birthday"
-            )
+            self._add_mawlid_day("Mawlud al-Nabi - Prophet Mohammad's Birthday")
 
 
 class AE(UnitedArabEmirates):
@@ -102,35 +94,35 @@ class ARE(UnitedArabEmirates):
     pass
 
 
-class UnitedArabEmiratesIslamicCalendar(_CustomCalendar, _IslamicLunar):
+class UnitedArabEmiratesIslamicCalendar(_CustomIslamicCalendar):
     EID_AL_ADHA_DATES = {
-        2017: ((SEP, 1),),
-        2018: ((AUG, 21),),
-        2019: ((AUG, 11),),
-        2020: ((JUL, 31),),
+        2017: (SEP, 1),
+        2018: (AUG, 21),
+        2019: (AUG, 11),
+        2020: (JUL, 31),
     }
 
     EID_AL_FITR_DATES = {
-        2017: ((JUN, 25),),
-        2018: ((JUN, 14),),
-        2019: ((JUN, 3),),
-        2020: ((MAY, 24),),
+        2017: (JUN, 25),
+        2018: (JUN, 14),
+        2019: (JUN, 3),
+        2020: (MAY, 24),
     }
 
     HIJRI_NEW_YEAR_DATES = {
-        2017: ((SEP, 22),),
-        2018: ((SEP, 11),),
-        2019: ((AUG, 31),),
-        2020: ((AUG, 23),),
+        2017: (SEP, 22),
+        2018: (SEP, 11),
+        2019: (AUG, 31),
+        2020: (AUG, 23),
     }
 
     ISRA_AND_MIRAJ_DATES = {
-        2017: ((APR, 23),),
-        2018: ((APR, 13),),
+        2017: (APR, 23),
+        2018: (APR, 13),
     }
 
     MAWLID_DATES = {
-        2017: ((NOV, 30),),
-        2018: ((NOV, 19),),
-        2019: ((NOV, 9),),
+        2017: (NOV, 30),
+        2018: (NOV, 19),
+        2019: (NOV, 9),
     }

holidays/countries/united_kingdom.py

@@ -11,39 +11,40 @@
 
 from datetime import date
 from datetime import timedelta as td
-from typing import Any, Tuple, Union
+from typing import Tuple, Union
 
-from dateutil.easter import easter
-
-from holidays.calendars import _get_nth_weekday_from, _get_nth_weekday_of_month
-from holidays.constants import JAN, MAR, APR, MAY, JUN, JUL, AUG, SEP, NOV
-from holidays.constants import DEC, MON
+from holidays.calendars import _get_nth_weekday_of_month
+from holidays.constants import MAR, APR, MAY, JUN, JUL, AUG, SEP, NOV, DEC, MON
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class UnitedKingdom(HolidayBase):
+class UnitedKingdom(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     https://en.wikipedia.org/wiki/Public_holidays_in_the_United_Kingdom
-    This class is extended by other countries (Ireland, Isle of Man, ...)
-    It must be taken into account when adding or modifying holidays.
-    Look at _country_specific() method for country specific behavior.
     """
 
     country = "GB"
     special_holidays = {
-        1977: ((JUN, 7, "Silver Jubilee of Elizabeth II"),),
-        1981: ((JUL, 29, "Wedding of Charles and Diana"),),
-        1999: ((DEC, 31, "Millennium Celebrations"),),
-        2002: ((JUN, 3, "Golden Jubilee of Elizabeth II"),),
-        2011: ((APR, 29, "Wedding of William and Catherine"),),
-        2012: ((JUN, 5, "Diamond Jubilee of Elizabeth II"),),
+        1977: (JUN, 7, "Silver Jubilee of Elizabeth II"),
+        1981: (JUL, 29, "Wedding of Charles and Diana"),
+        1999: (DEC, 31, "Millennium Celebrations"),
+        2002: (JUN, 3, "Golden Jubilee of Elizabeth II"),
+        2011: (APR, 29, "Wedding of William and Catherine"),
+        2012: (JUN, 5, "Diamond Jubilee of Elizabeth II"),
         2022: (
             (JUN, 3, "Platinum Jubilee of Elizabeth II"),
             (SEP, 19, "State Funeral of Queen Elizabeth II"),
         ),
-        2023: ((MAY, 8, "Coronation of Charles III"),),
+        2023: (MAY, 8, "Coronation of Charles III"),
     }
     subdivisions: Union[Tuple[()], Tuple[str, ...]] = (
+        "ENG",  # England
+        "NIR",  # Northern Ireland
+        "SCT",  # Scotland
+        "WLS",  # Wales
+    )
+    _deprecated_subdivisions: Tuple[str, ...] = (
         "England",
         "Northern Ireland",
         "Scotland",
@@ -51,124 +52,131 @@ class UnitedKingdom(HolidayBase):
         "Wales",
     )
 
-    def __init__(self, **kwargs: Any) -> None:
-        # default subdiv to UK; state for backwards compatibility
-        if not kwargs.get("subdiv", kwargs.get("state")):
-            kwargs["subdiv"] = "UK"
-        HolidayBase.__init__(self, **kwargs)
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
+    def _add_observed(self, dt: date, days: int = +1) -> None:
+        if self.observed and self._is_weekend(dt):
+            self._add_holiday(
+                "%s (Observed)" % self[dt],
+                dt + td(days=+2 if self._is_saturday(dt) else days),
+            )
 
     def _populate(self, year: int) -> None:
         super()._populate(year)
 
-        # New Year's Day
-        if year >= 1974:
-            name = "New Year's Day"
-            dt = date(year, JAN, 1)
-            self[dt] = name
-            if self.observed and self._is_weekend(dt):
-                self[_get_nth_weekday_from(1, MON, dt)] = name + " (Observed)"
+        # Good Friday
+        self._add_good_friday("Good Friday")
 
-        # New Year Holiday
-        if self.subdiv in {"Scotland", "UK"}:
-            name = "New Year Holiday"
-            dt = date(year, JAN, 2)
-            if self.subdiv == "UK":
-                name += " [Scotland]"
-            self[dt] = name
-            if self.observed and self._is_weekend(dt):
-                self[dt + td(days=+2)] = name + " (Observed)"
-            elif self.observed and self._is_monday(dt):
-                self[dt + td(days=+1)] = name + " (Observed)"
+        # May Day bank holiday (first Monday in May)
+        if year >= 1978:
+            dt = (
+                date(year, MAY, 8)
+                # In 2020 moved to Friday to mark 75th anniversary of VE Day.
+                if year in {1995, 2020}
+                else _get_nth_weekday_of_month(1, MON, MAY, year)
+            )
+            self._add_holiday("May Day", dt)
 
-        # St. Patrick's Day
-        if self.subdiv in {"Northern Ireland", "UK"}:
-            name = "St. Patrick's Day"
-            dt = date(year, MAR, 17)
-            if self.subdiv == "UK":
-                name += " [Northern Ireland]"
-            self[dt] = name
-            if self.observed and self._is_weekend(dt):
-                self[_get_nth_weekday_from(1, MON, dt)] = name + " (Observed)"
+        # Spring bank holiday (last Monday in May)
+        if year >= 1971:
+            spring_bank_dates = {
+                2002: date(year, JUN, 4),
+                2012: date(year, JUN, 4),
+                2022: date(year, JUN, 2),
+            }
+            dt = spring_bank_dates.get(year, _get_nth_weekday_of_month(-1, MON, MAY, year))
+            self._add_holiday("Spring Bank Holiday", dt)
 
-        # Battle of the Boyne
-        if self.subdiv in {"Northern Ireland", "UK"}:
-            name = "Battle of the Boyne"
-            if self.subdiv == "UK":
-                name += " [Northern Ireland]"
-            self[date(year, JUL, 12)] = name
+        # Christmas Day
+        self._add_observed(self._add_christmas_day("Christmas Day"), days=+2)
 
-        # Summer bank holiday (first Monday in August)
-        if self.subdiv in {"Scotland", "UK"}:
-            name = "Summer Bank Holiday"
-            if self.subdiv == "UK":
-                name += " [Scotland]"
-            self[_get_nth_weekday_of_month(1, MON, AUG, year)] = name
+        # Boxing Day
+        self._add_observed(self._add_christmas_day_two("Boxing Day"), days=+2)
+
+        if self.subdiv == "England":
+            self._add_subdiv_eng_holidays()
+        elif self.subdiv == "Northern Ireland":
+            self._add_subdiv_nir_holidays()
+        elif self.subdiv == "Scotland":
+            self._add_subdiv_sct_holidays()
+        elif self.subdiv == "Wales":
+            self._add_subdiv_wls_holidays()
+
+    def _add_subdiv_holidays(self):
+        if self.subdiv not in {"SCT", "Scotland"}:
+            # New Year's Day
+            if self._year >= 1974:
+                self._add_observed(self._add_new_years_day("New Year's Day"))
+
+        super()._add_subdiv_holidays()
+
+    def _add_subdiv_eng_holidays(self):
+        # Easter Monday
+        self._add_easter_monday("Easter Monday")
 
-        # St. Andrew's Day
-        if self.subdiv in {"Scotland", "UK"}:
-            name = "St. Andrew's Day"
-            if self.subdiv == "UK":
-                name += " [Scotland]"
-            self[date(year, NOV, 30)] = name
+        # Late Summer bank holiday (last Monday in August)
+        if self._year >= 1971:
+            self._add_holiday(
+                "Late Summer Bank Holiday",
+                _get_nth_weekday_of_month(-1, MON, AUG, self._year),
+            )
 
-        # Christmas Day
-        name = "Christmas Day"
-        dt = date(year, DEC, 25)
-        self[dt] = name
-        if self.observed and self._is_weekend(dt):
-            self[dt + td(days=+2)] = name + " (Observed)"
+    def _add_subdiv_nir_holidays(self):
+        # St. Patrick's Day
+        self._add_observed(self._add_holiday("St. Patrick's Day", MAR, 17))
 
-        # Overwrite to modify country specific holidays
-        self._country_specific(year)
+        # Easter Monday
+        self._add_easter_monday("Easter Monday")
 
-    def _country_specific(self, year: int) -> None:
-        # This method is replaced by class Ireland
+        # Battle of the Boyne
+        self._add_holiday("Battle of the Boyne", JUL, 12)
 
-        # UnitedKingdom exclusive holidays
+        # Late Summer bank holiday (last Monday in August)
+        if self._year >= 1971:
+            self._add_holiday(
+                "Late Summer Bank Holiday",
+                _get_nth_weekday_of_month(-1, MON, AUG, self._year),
+            )
 
-        easter_date = easter(year)
-        # Good Friday
-        self[easter_date + td(days=-2)] = "Good Friday"
+    def _add_subdiv_sct_holidays(self):
+        # New Year's Day
+        name = "New Year's Day"
+        jan_1 = self._add_new_years_day(name)
+        if self.observed and self._is_weekend(jan_1):
+            self._add_holiday(
+                "%s (Observed)" % name,
+                jan_1 + td(days=+3 if self._is_saturday(jan_1) else +1),
+            )
 
-        # Easter Monday
-        if self.subdiv != "Scotland":
-            name = "Easter Monday"
-            if self.subdiv == "UK":
-                name += " [England/Wales/Northern Ireland]"
-            self[easter_date + td(days=+1)] = name
+        # New Year Holiday
+        name = "New Year Holiday"
+        jan_2 = self._add_new_years_day_two(name)
+        self._add_observed(jan_2)
+        if self.observed and self._is_monday(jan_2):
+            self._add_new_years_day_three("%s (Observed)" % name)
 
-        # May Day bank holiday (first Monday in May)
-        if year >= 1978:
-            name = "May Day"
-            if year == 1995 or year == 2020:
-                # In 2020 moved to Friday to mark 75th anniversary of VE Day.
-                dt = date(year, MAY, 8)
-            else:
-                dt = _get_nth_weekday_of_month(1, MON, MAY, year)
-            self[dt] = name
+        # Summer bank holiday (first Monday in August)
+        self._add_holiday(
+            "Summer Bank Holiday",
+            _get_nth_weekday_of_month(1, MON, AUG, self._year),
+        )
 
-        # Spring bank holiday (last Monday in May)
-        name = "Spring Bank Holiday"
-        if year == 2012:
-            self[date(year, JUN, 4)] = name
-        elif year == 2022:
-            self[date(year, JUN, 2)] = name
-        elif year >= 1971:
-            self[_get_nth_weekday_of_month(-1, MON, MAY, year)] = name
+        # St. Andrew's Day
+        self._add_holiday("St. Andrew's Day", NOV, 30)
 
-        # Late Summer bank holiday (last Monday in August)
-        if self.subdiv != "Scotland" and year >= 1971:
-            name = "Late Summer Bank Holiday"
-            if self.subdiv == "UK":
-                name += " [England/Wales/Northern Ireland]"
-            self[_get_nth_weekday_of_month(-1, MON, AUG, year)] = name
+    def _add_subdiv_wls_holidays(self):
+        # Easter Monday
+        self._add_easter_monday("Easter Monday")
 
-        # Boxing Day
-        name = "Boxing Day"
-        dt = date(year, DEC, 26)
-        self[dt] = name
-        if self.observed and self._is_weekend(dt):
-            self[dt + td(days=+2)] = name + " (Observed)"
+        # Late Summer bank holiday (last Monday in August)
+        if self._year >= 1971:
+            self._add_holiday(
+                "Late Summer Bank Holiday",
+                _get_nth_weekday_of_month(-1, MON, AUG, self._year),
+            )
 
 
 class UK(UnitedKingdom):

holidays/countries/united_states.py

@@ -16,8 +16,24 @@ from typing import Tuple, Union
 from dateutil.easter import easter
 
 from holidays.calendars import _get_nth_weekday_from, _get_nth_weekday_of_month
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC, MON, TUE, THU, FRI
+from holidays.constants import (
+    JAN,
+    FEB,
+    MAR,
+    APR,
+    MAY,
+    JUN,
+    JUL,
+    AUG,
+    SEP,
+    OCT,
+    NOV,
+    DEC,
+    MON,
+    TUE,
+    THU,
+    FRI,
+)
 from holidays.holiday_base import HolidayBase
 
 
@@ -138,11 +154,7 @@ class UnitedStates(HolidayBase):
                 self[date(year, JAN, 19)] = name
 
         # Inauguration Day
-        if (
-            self.subdiv in {"DC", "LA", "MD", "VA"}
-            and year >= 1789
-            and (year - 1789) % 4 == 0
-        ):
+        if self.subdiv in {"DC", "LA", "MD", "VA"} and year >= 1789 and (year - 1789) % 4 == 0:
             if year >= 1937:
                 dt = date(year, JAN, 20)
             else:
@@ -154,13 +166,8 @@ class UnitedStates(HolidayBase):
             name = "Martin Luther King Jr. Day"
             if self.subdiv == "AL":
                 name = "Robert E. Lee/Martin Luther King Birthday"
-            elif (self.subdiv == "MS") or (
-                (self.subdiv == "AR") and (year <= 2017)
-            ):
-                name = (
-                    "Dr. Martin Luther King Jr. "
-                    "and Robert E. Lee's Birthdays"
-                )
+            elif (self.subdiv == "MS") or ((self.subdiv == "AR") and (year <= 2017)):
+                name = "Dr. Martin Luther King Jr. and Robert E. Lee's Birthdays"
             elif self.subdiv in {"AZ", "NH"}:
                 name = "Dr. Martin Luther King Jr./Civil Rights Day"
             elif self.subdiv == "GA" and year <= 2011:
@@ -170,9 +177,9 @@ class UnitedStates(HolidayBase):
             self[_get_nth_weekday_of_month(3, MON, JAN, year)] = name
 
         # Lincoln's Birthday
-        if (
-            self.subdiv in {"CT", "IA", "IL", "NJ", "NY"} and year >= 1971
-        ) or (self.subdiv == "CA" and 1971 <= year <= 2009):
+        if (self.subdiv in {"CT", "IA", "IL", "NJ", "NY"} and year >= 1971) or (
+            self.subdiv == "CA" and 1971 <= year <= 2009
+        ):
             self._add_with_observed(date(year, FEB, 12), "Lincoln's Birthday")
 
         # Susan B. Anthony Day
@@ -212,15 +219,11 @@ class UnitedStates(HolidayBase):
 
         # Guam Discovery Day
         if self.subdiv == "GU" and year >= 1970:
-            self[
-                _get_nth_weekday_of_month(1, MON, MAR, year)
-            ] = "Guam Discovery Day"
+            self[_get_nth_weekday_of_month(1, MON, MAR, year)] = "Guam Discovery Day"
 
         # Casimir Pulaski Day
         if self.subdiv == "IL" and year >= 1978:
-            self[
-                _get_nth_weekday_of_month(1, MON, MAR, year)
-            ] = "Casimir Pulaski Day"
+            self[_get_nth_weekday_of_month(1, MON, MAR, year)] = "Casimir Pulaski Day"
 
         # Texas Independence Day
         if self.subdiv == "TX" and year >= 1874:
@@ -228,9 +231,7 @@ class UnitedStates(HolidayBase):
 
         # Town Meeting Day
         if self.subdiv == "VT" and year >= 1800:
-            self[
-                _get_nth_weekday_of_month(1, TUE, MAR, year)
-            ] = "Town Meeting Day"
+            self[_get_nth_weekday_of_month(1, TUE, MAR, year)] = "Town Meeting Day"
 
         # Evacuation Day
         if self.subdiv == "MA" and year >= 1901:
@@ -242,21 +243,15 @@ class UnitedStates(HolidayBase):
 
         # Emancipation Day
         if self.subdiv == "PR":
-            self._add_with_observed(
-                date(year, MAR, 22), "Emancipation Day", before=False
-            )
+            self._add_with_observed(date(year, MAR, 22), "Emancipation Day", before=False)
 
         # Commonwealth Covenant Day in Northern Mariana Islands
         if self.subdiv == "MP":
-            self._add_with_observed(
-                date(year, MAR, 24), "Commonwealth Covenant Day"
-            )
+            self._add_with_observed(date(year, MAR, 24), "Commonwealth Covenant Day")
 
         # Prince Jonah Kuhio Kalanianaole Day
         if self.subdiv == "HI" and year >= 1949:
-            self._add_with_observed(
-                date(year, MAR, 26), "Prince Jonah Kuhio Kalanianaole Day"
-            )
+            self._add_with_observed(date(year, MAR, 26), "Prince Jonah Kuhio Kalanianaole Day")
 
         # Seward's Day
         if self.subdiv == "AK":
@@ -341,9 +336,7 @@ class UnitedStates(HolidayBase):
                 self[date(year, APR, 22)] = name
 
         # Primary Election Day
-        if self.subdiv == "IN" and (
-            (year >= 2006 and year % 2 == 0) or year >= 2015
-        ):
+        if self.subdiv == "IN" and ((year >= 2006 and year % 2 == 0) or year >= 2015):
             self[
                 _get_nth_weekday_of_month(1, MON, MAY, year) + td(days=+1)
             ] = "Primary Election Day"
@@ -354,17 +347,13 @@ class UnitedStates(HolidayBase):
 
         # Memorial Day
         if year >= 1971:
-            self[
-                _get_nth_weekday_of_month(-1, MON, MAY, year)
-            ] = "Memorial Day"
+            self[_get_nth_weekday_of_month(-1, MON, MAY, year)] = "Memorial Day"
         elif year >= 1888:
             self[date(year, MAY, 30)] = "Memorial Day"
 
         # Juneteenth Day
         if year >= 2021:
-            self._add_with_observed(
-                date(year, JUN, 19), "Juneteenth National Independence Day"
-            )
+            self._add_with_observed(date(year, JUN, 19), "Juneteenth National Independence Day")
 
         # Jefferson Davis Birthday
         name = "Jefferson Davis Birthday"
@@ -406,9 +395,7 @@ class UnitedStates(HolidayBase):
 
         # Constitution Day
         if self.subdiv == "PR":
-            self._add_with_observed(
-                date(year, JUL, 25), "Constitution Day", before=False
-            )
+            self._add_with_observed(date(year, JUL, 25), "Constitution Day", before=False)
 
         # Victory Day
         if self.subdiv == "RI" and year >= 1948:
@@ -416,15 +403,11 @@ class UnitedStates(HolidayBase):
 
         # Statehood Day (Hawaii)
         if self.subdiv == "HI" and year >= 1959:
-            self[
-                _get_nth_weekday_of_month(3, FRI, AUG, year)
-            ] = "Statehood Day"
+            self[_get_nth_weekday_of_month(3, FRI, AUG, year)] = "Statehood Day"
 
         # Bennington Battle Day
         if self.subdiv == "VT" and year >= 1778:
-            self._add_with_observed(
-                date(year, AUG, 16), "Bennington Battle Day"
-            )
+            self._add_with_observed(date(year, AUG, 16), "Bennington Battle Day")
 
         # Lyndon Baines Johnson Day
         if self.subdiv == "TX" and year >= 1973:
@@ -449,9 +432,7 @@ class UnitedStates(HolidayBase):
 
         # Commonwealth Cultural Day in Northern Mariana Islands
         if self.subdiv == "MP":
-            self[
-                _get_nth_weekday_of_month(2, MON, OCT, year)
-            ] = "Commonwealth Cultural Day"
+            self[_get_nth_weekday_of_month(2, MON, OCT, year)] = "Commonwealth Cultural Day"
 
         # Alaska Day
         if self.subdiv == "AK" and year >= 1867:
@@ -487,9 +468,7 @@ class UnitedStates(HolidayBase):
             and year >= 2008
             and year % 2 == 0
         ) or (self.subdiv in {"IN", "NY"} and year >= 2015):
-            self[
-                _get_nth_weekday_of_month(1, MON, NOV, year) + td(days=+1)
-            ] = "Election Day"
+            self[_get_nth_weekday_of_month(1, MON, NOV, year) + td(days=+1)] = "Election Day"
 
         # All Souls' Day
         if self.subdiv == "GU":
@@ -511,9 +490,7 @@ class UnitedStates(HolidayBase):
 
         # Discovery Day
         if self.subdiv == "PR":
-            self._add_with_observed(
-                date(year, NOV, 19), "Discovery Day", before=False
-            )
+            self._add_with_observed(date(year, NOV, 19), "Discovery Day", before=False)
 
         # Thanksgiving
         if year >= 1871:
@@ -526,10 +503,7 @@ class UnitedStates(HolidayBase):
         # Family Day
         # New Mexico Presidents' Day
         if (
-            (
-                self.subdiv in {"CA", "DE", "FL", "NC", "NH", "OK", "TX", "WV"}
-                and year >= 1975
-            )
+            (self.subdiv in {"CA", "DE", "FL", "NC", "NH", "OK", "TX", "WV"} and year >= 1975)
             or (self.subdiv == "IN" and year >= 2010)
             or (self.subdiv == "MD" and year >= 2008)
             or self.subdiv in {"NM", "NV", "PA"}
@@ -546,9 +520,7 @@ class UnitedStates(HolidayBase):
                 name = "Family Day"
             if self.subdiv == "NM":
                 name = "Presidents' Day"
-            self[
-                _get_nth_weekday_of_month(4, THU, NOV, year) + td(days=+1)
-            ] = name
+            self[_get_nth_weekday_of_month(4, THU, NOV, year) + td(days=+1)] = name
 
         # Robert E. Lee's Birthday
         if self.subdiv == "GA" and year >= 1986:
@@ -556,9 +528,7 @@ class UnitedStates(HolidayBase):
                 name = "State Holiday"
             else:
                 name = "Robert E. Lee's Birthday"
-            self[
-                _get_nth_weekday_of_month(4, THU, NOV, year) + td(days=+1)
-            ] = name
+            self[_get_nth_weekday_of_month(4, THU, NOV, year) + td(days=+1)] = name
 
         # Lady of Camarin Day
         if self.subdiv == "GU":

holidays/countries/uruguay.py

@@ -25,6 +25,7 @@ class Uruguay(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "UY"
     default_language = "es"
+    supported_languages = ("en_US", "es", "uk")
 
     def __init__(self, *args, **kwargs) -> None:
         ChristianHolidays.__init__(self)