holidays 0.58__py3-none-any.whl → 0.59__py3-none-any.whl

holidays/countries/taiwan.py

@@ -12,7 +12,6 @@
 
 from datetime import date
 from gettext import gettext as tr
-from typing import Set
 
 from holidays.calendars.gregorian import (
     JAN,
@@ -80,7 +79,7 @@ class Taiwan(ObservedHolidayBase, ChineseCalendarHolidays, InternationalHolidays
         super().__init__(*args, **kwargs)
 
     def _populate_observed(
-        self, dts: Set[date], rule: ObservedRule = None, since: int = 2015
+        self, dts: set[date], rule: ObservedRule = None, since: int = 2015
     ) -> None:
         if self._year < since:
             return None

holidays/countries/ukraine.py

@@ -103,9 +103,7 @@ class Ukraine(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Sta
                 else tr("День перемоги")
             )
             dts_observed.add(
-                self._add_holiday_may_8(name)
-                if self._year >= 2024
-                else self._add_world_war_two_victory_day(name)
+                self._add_world_war_two_victory_day(name, is_western=(self._year >= 2024))
             )
 
             if self._year >= 1997:

holidays/countries/united_arab_emirates.py

@@ -13,7 +13,7 @@
 from gettext import gettext as tr
 
 from holidays.calendars import _CustomIslamicHolidays
-from holidays.calendars.gregorian import APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, FRI, SAT
+from holidays.calendars.gregorian import APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, FRI, SAT, SUN
 from holidays.groups import InternationalHolidays, IslamicHolidays
 from holidays.holiday_base import HolidayBase
 
@@ -35,7 +35,6 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
     # %s (estimated).
     estimated_label = tr("(تقدير) %s")
     supported_languages = ("ar", "en_US")
-    weekend = {FRI, SAT}
 
     def __init__(self, *args, **kwargs):
         InternationalHolidays.__init__(self)
@@ -43,6 +42,10 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
+        # The resting days are Saturday and Sunday since Jan 1, 2022.
+        # https://time.com/6126260/uae-working-days-weekend/
+        self.weekend = {FRI, SAT} if self._year <= 2021 else {SAT, SUN}
+
         # New Year's Day.
         self._add_new_years_day(tr("رأس السنة الميلادية"))
 

holidays/countries/united_kingdom.py

@@ -10,7 +10,7 @@
 #  Website: https://github.com/vacanza/holidays
 #  License: MIT (see LICENSE file)
 
-from typing import Tuple, Union
+from typing import Union
 
 from holidays.calendars.gregorian import APR, MAY, JUN, JUL, SEP, DEC
 from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
@@ -38,7 +38,7 @@ class UnitedKingdom(ObservedHolidayBase, ChristianHolidays, InternationalHoliday
 
     country = "GB"
     observed_label = "%s (observed)"
-    subdivisions: Union[Tuple[()], Tuple[str, ...]] = (
+    subdivisions: Union[tuple[()], tuple[str, ...]] = (
         "ENG",  # England
         "NIR",  # Northern Ireland
         "SCT",  # Scotland

holidays/countries/united_states.py

@@ -10,7 +10,7 @@
 #  Website: https://github.com/vacanza/holidays
 #  License: MIT (see LICENSE file)
 
-from typing import Tuple, Union
+from typing import Union
 
 from holidays.calendars.gregorian import MON, TUE, WED, THU, FRI, SAT, SUN
 from holidays.constants import PUBLIC, UNOFFICIAL
@@ -62,7 +62,7 @@ class UnitedStates(ObservedHolidayBase, ChristianHolidays, InternationalHolidays
     country = "US"
     supported_categories = (PUBLIC, UNOFFICIAL)
     observed_label = "%s (observed)"
-    subdivisions: Union[Tuple[()], Tuple[str, ...]] = (
+    subdivisions: Union[tuple[()], tuple[str, ...]] = (
         "AK",  # Alaska.
         "AL",  # Alabama.
         "AR",  # Arkansas.

holidays/countries/uzbekistan.py

@@ -68,7 +68,8 @@ class Uzbekistan(ObservedHolidayBase, InternationalHolidays, IslamicHolidays, St
                 tr("Xotira va qadrlash kuni")
                 if self._year >= 1999
                 # Victory Day.
-                else tr("G‘alaba kuni")
+                else tr("G‘alaba kuni"),
+                is_western=False,
             )
         )
 

holidays/countries/vietnam.py

@@ -10,69 +10,135 @@
 #  Website: https://github.com/vacanza/holidays
 #  License: MIT (see LICENSE file)
 
+from datetime import date
 from gettext import gettext as tr
 
-from holidays.groups import ChineseCalendarHolidays, InternationalHolidays
-from holidays.observed_holiday_base import ObservedHolidayBase, SAT_SUN_TO_NEXT_WORKDAY
-
-
-class Vietnam(ObservedHolidayBase, ChineseCalendarHolidays, InternationalHolidays):
+from holidays.calendars.gregorian import (
+    JAN,
+    FEB,
+    APR,
+    MAY,
+    SEP,
+    DEC,
+    MON,
+    TUE,
+    WED,
+    THU,
+    FRI,
+    SAT,
+    SUN,
+    _timedelta,
+)
+from holidays.groups import ChineseCalendarHolidays, InternationalHolidays, StaticHolidays
+from holidays.observed_holiday_base import (
+    ObservedHolidayBase,
+    ObservedRule,
+    SAT_TO_PREV_WORKDAY,
+    SUN_TO_NEXT_WORKDAY,
+    SAT_SUN_TO_NEXT_WORKDAY,
+)
+
+NATIONAL_DAY_RULE = ObservedRule({MON: +1, TUE: -1, WED: -1, THU: +1, FRI: -1, SAT: -1, SUN: +1})
+
+
+class Vietnam(ObservedHolidayBase, ChineseCalendarHolidays, InternationalHolidays, StaticHolidays):
     """
-    https://publicholidays.vn/
-    http://vbpl.vn/TW/Pages/vbpqen-toanvan.aspx?ItemID=11013 Article.115
-    https://www.timeanddate.com/holidays/vietnam/
+    References:
+        - `Labor Code 1994 (Art. 73) (en) <https://vbpl.vn/TW/Pages/vbpqen-toanvan.aspx?ItemID=2835>`_
+        - `Labor Code 2012 (Art. 115) (en) <https://vbpl.vn/TW/Pages/vbpqen-toanvan.aspx?ItemID=11013>`_
+        - `Labor Code 2012 (Art. 115) (vi) <https://vbpl.vn/TW/Pages/vbpq-toanvan.aspx?ItemID=27615>`_
+        - `Labor Code 2019 (Art. 112) (en) <https://vbpl.vn/TW/Pages/vbpqen-toanvan.aspx?ItemID=11135>`_
+        - `Labor Code 2019 (Art. 112) (vi) <https://vbpl.vn/TW/Pages/vbpq-van-ban-goc.aspx?ItemID=139264>`_
+
+    Substituted holidays:
+        - `2018-2019 <https://thuvienphapluat.vn/cong-van/EN/Lao-dong-Tien-luong/Official-Dispatch-6519-VPCP-KGVX-2018-national-holidays-for-public-sector-employees/387625/tieng-anh.aspx>`_
+        - `2024 <https://thuvienphapluat.vn/cong-van/EN/Lao-dong-Tien-luong/Official-Dispatch-2450-VPCP-KGVX-2024-swap-of-working-days-during-the-Reunification-Day/606458/tieng-anh.aspx>`_
     """
 
     country = "VN"
     # %s (observed).
     observed_label = tr("%s (nghỉ bù)")
     default_language = "vi"
-    supported_languages = ("en_US", "vi")
+    supported_languages = ("en_US", "th", "vi")
 
     def __init__(self, *args, **kwargs):
         ChineseCalendarHolidays.__init__(self)
         InternationalHolidays.__init__(self)
+        StaticHolidays.__init__(self, VietnamStaticHolidays)
         kwargs.setdefault("observed_rule", SAT_SUN_TO_NEXT_WORKDAY)
+        kwargs.setdefault("observed_since", 1995)
         super().__init__(*args, **kwargs)
 
+    def _add_lunar_new_year_observed(self, dt_lny: date) -> None:
+        if self._year <= 1994:
+            return None
+
+        day_names = {
+            # 29 of Lunar New Year.
+            -2: tr("29 Tết"),
+            # Fourth Day of Lunar New Year.
+            3: tr("Mùng bốn Tết Nguyên Đán"),
+            # Fifth Day of Lunar New Year.
+            4: tr("Mùng năm Tết Nguyên Đán"),
+            # Sixth Day of Lunar New Year.
+            5: tr("Mùng sáu Tết Nguyên Đán"),
+        }
+        for delta in range(-1, 4 if self._year >= 2013 else 3):
+            dt = _timedelta(dt_lny, delta)
+            dt_observed = self._get_observed_date(
+                dt,
+                rule=(
+                    SAT_TO_PREV_WORKDAY + SUN_TO_NEXT_WORKDAY
+                    if self._year >= 2014
+                    else SAT_SUN_TO_NEXT_WORKDAY
+                ),
+            )
+            if dt_observed != dt:
+                self._add_holiday(
+                    day_names[(dt_observed - dt_lny).days],  # type: ignore[operator]
+                    dt_observed,
+                )
+
     def _populate_public_holidays(self):
         dts_observed = set()
 
-        # New Year's Day
+        # New Year's Day.
         dts_observed.add(self._add_new_years_day(tr("Tết Dương lịch")))
 
-        # Lunar New Year's Eve
+        # Lunar New Year's Eve.
         self._add_chinese_new_years_eve(tr("Giao thừa Tết Nguyên Đán"))
 
-        # Lunar New Year
-        self._add_chinese_new_years_day(tr("Tết Nguyên Đán"))
+        # Lunar New Year.
+        lny = self._add_chinese_new_years_day(tr("Tết Nguyên Đán"))
 
-        # Second Day of Lunar New Year
+        # Second Day of Lunar New Year.
         self._add_chinese_new_years_day_two(tr("Mùng hai Tết Nguyên Đán"))
 
-        # Third Day of Lunar New Year
+        # Third Day of Lunar New Year.
         self._add_chinese_new_years_day_three(tr("Mùng ba Tết Nguyên Đán"))
 
-        # Fourth Day of Lunar New Year
-        self._add_chinese_new_years_day_four(tr("Mùng bốn Tết Nguyên Đán"))
-
-        # Fifth Day of Lunar New Year
-        self._add_chinese_new_years_day_five(tr("Mùng năm Tết Nguyên Đán"))
+        if self._year >= 2013:
+            # Fourth Day of Lunar New Year.
+            self._add_chinese_new_years_day_four(tr("Mùng bốn Tết Nguyên Đán"))
 
         if self._year >= 2007:
-            # Hung Kings' Commemoration Day
+            # Hung Kings' Commemoration Day.
             dts_observed.add(self._add_hung_kings_day(tr("Ngày Giỗ Tổ Hùng Vương")))
 
-        # Liberation Day/Reunification Day
+        # Liberation Day/Reunification Day.
         dts_observed.add(self._add_holiday_apr_30(tr("Ngày Chiến thắng")))
 
-        # International Labor Day
+        # International Labor Day.
         dts_observed.add(self._add_labor_day(tr("Ngày Quốc tế Lao động")))
 
-        # National Day
-        dts_observed.add(self._add_holiday_sep_2(tr("Quốc khánh")))
+        # National Day.
+        name = tr("Quốc khánh")
+        dts_observed.add(sep_2 := self._add_holiday_sep_2(name))
+        if self._year >= 2021:
+            self._add_holiday(name, self._get_observed_date(sep_2, NATIONAL_DAY_RULE))
 
         if self.observed:
+            self._add_lunar_new_year_observed(lny)
             self._populate_observed(dts_observed)
 
 
@@ -82,3 +148,28 @@ class VN(Vietnam):
 
 class VNM(Vietnam):
     pass
+
+
+class VietnamStaticHolidays:
+    # Date format (see strftime() Format Codes).
+    substituted_date_format = tr("%d/%m/%Y")
+    # Day off (substituted from %s).
+    substituted_label = tr("Ngày nghỉ (thay cho ngày %s)")
+
+    special_public_holidays = {
+        2010: (FEB, 19, FEB, 27),
+        2012: (JAN, 27, FEB, 4),
+        2013: (APR, 29, MAY, 4),
+        2014: (
+            (MAY, 2, APR, 26),
+            (SEP, 1, SEP, 6),
+        ),
+        2015: (
+            (JAN, 2, DEC, 27, 2014),
+            (FEB, 16, FEB, 14),
+            (APR, 29, APR, 25),
+        ),
+        2018: (DEC, 31, JAN, 5, 2019),
+        2019: (APR, 29, MAY, 4),
+        2024: (APR, 29, MAY, 4),
+    }

holidays/groups/__init__.py

@@ -16,6 +16,7 @@ from holidays.groups.buddhist import BuddhistCalendarHolidays
 from holidays.groups.chinese import ChineseCalendarHolidays
 from holidays.groups.christian import ChristianHolidays
 from holidays.groups.custom import StaticHolidays
+from holidays.groups.eastern import EasternCalendarHolidays
 from holidays.groups.hindu import HinduCalendarHolidays
 from holidays.groups.international import InternationalHolidays
 from holidays.groups.islamic import IslamicHolidays

holidays/groups/buddhist.py

@@ -11,12 +11,13 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from typing import Optional, Tuple
+from typing import Optional
 
 from holidays.calendars import _BuddhistLunisolar
+from holidays.groups.eastern import EasternCalendarHolidays
 
 
-class BuddhistCalendarHolidays:
+class BuddhistCalendarHolidays(EasternCalendarHolidays):
     """
     Buddhist lunisolar calendar holidays.
     """
@@ -26,7 +27,7 @@ class BuddhistCalendarHolidays:
         self._buddhist_calendar_show_estimated = show_estimated
 
     def _add_buddhist_calendar_holiday(
-        self, name: str, dt_estimated: Tuple[date, bool]
+        self, name: str, dt_estimated: tuple[Optional[date], bool]
     ) -> Optional[date]:
         """
         Add Buddhist calendar holiday.
@@ -34,14 +35,8 @@ class BuddhistCalendarHolidays:
         Adds customizable estimation label to holiday name if holiday date
         is an estimation.
         """
-        estimated_label = getattr(self, "estimated_label", "%s (estimated)")
-        dt, is_estimated = dt_estimated
-
-        return self._add_holiday(
-            self.tr(estimated_label) % self.tr(name)
-            if is_estimated and self._buddhist_calendar_show_estimated
-            else name,
-            dt,
+        return self._add_eastern_calendar_holiday(
+            name, dt_estimated, self._buddhist_calendar_show_estimated
         )
 
     def _add_vesak(self, name) -> Optional[date]:

holidays/groups/chinese.py

@@ -11,13 +11,14 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from typing import Optional, Tuple
+from typing import Optional
 
 from holidays.calendars import _ChineseLunisolar
-from holidays.calendars.gregorian import APR, _timedelta
+from holidays.calendars.gregorian import APR
+from holidays.groups.eastern import EasternCalendarHolidays
 
 
-class ChineseCalendarHolidays:
+class ChineseCalendarHolidays(EasternCalendarHolidays):
     """
     Chinese lunisolar calendar holidays.
     """
@@ -48,7 +49,7 @@ class ChineseCalendarHolidays:
         return self._chinese_calendar.mid_autumn_date(self._year)[0]
 
     def _add_chinese_calendar_holiday(
-        self, name: str, dt_estimated: Tuple[date, bool], days_delta: int = 0
+        self, name: str, dt_estimated: tuple[Optional[date], bool], days_delta: int = 0
     ) -> Optional[date]:
         """
         Add Chinese calendar holiday.
@@ -56,17 +57,8 @@ class ChineseCalendarHolidays:
         Adds customizable estimation label to holiday name if holiday date
         is an estimation.
         """
-        estimated_label = getattr(self, "estimated_label", "%s (estimated)")
-        dt, is_estimated = dt_estimated
-
-        if days_delta != 0:
-            dt = _timedelta(dt, days_delta)
-
-        return self._add_holiday(
-            self.tr(estimated_label) % self.tr(name)
-            if is_estimated and self._chinese_calendar_show_estimated
-            else name,
-            dt,
+        return self._add_eastern_calendar_holiday(
+            name, dt_estimated, self._chinese_calendar_show_estimated, days_delta
         )
 
     def _add_chinese_birthday_of_buddha(self, name) -> Optional[date]:
@@ -136,16 +128,6 @@ class ChineseCalendarHolidays:
             name, self._chinese_calendar.lunar_new_year_date(self._year), days_delta=+3
         )
 
-    def _add_chinese_new_years_day_five(self, name) -> Optional[date]:
-        """
-        Add Chinese New Year's Day Five.
-
-        https://en.wikipedia.org/wiki/Chinese_New_Year
-        """
-        return self._add_chinese_calendar_holiday(
-            name, self._chinese_calendar.lunar_new_year_date(self._year), days_delta=+4
-        )
-
     def _add_qingming_festival(self, name) -> date:
         """
         Add Qingming Festival (15th day after the Spring Equinox).

holidays/groups/eastern.py

@@ -0,0 +1,51 @@
+#  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: Vacanza Team and individual contributors (see AUTHORS file)
+#           dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/vacanza/holidays
+#  License: MIT (see LICENSE file)
+
+from datetime import date
+from typing import Optional
+
+from holidays.calendars.gregorian import _timedelta
+
+
+class EasternCalendarHolidays:
+    """
+    Eastern calendar holidays base class.
+    """
+
+    def _add_eastern_calendar_holiday(
+        self,
+        name: str,
+        dt_estimated: tuple[Optional[date], bool],
+        show_estimated: bool = True,
+        days_delta: int = 0,
+    ) -> Optional[date]:
+        """
+        Add Eastern (Buddhist, Chinese, Hindu, Islamic) calendar holiday.
+
+        Adds customizable estimation label to holiday name if holiday date is an estimation.
+        """
+        estimated_label = getattr(self, "estimated_label", "%s (estimated)")
+        dt, is_estimated = dt_estimated
+
+        if days_delta and dt:
+            dt = _timedelta(dt, days_delta)
+
+        return (
+            self._add_holiday(
+                self.tr(estimated_label) % self.tr(name)
+                if is_estimated and show_estimated
+                else name,
+                dt,
+            )
+            if dt
+            else None
+        )

holidays/groups/hindu.py

@@ -11,12 +11,13 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from typing import Optional, Tuple
+from typing import Optional
 
 from holidays.calendars import _HinduLunisolar
+from holidays.groups.eastern import EasternCalendarHolidays
 
 
-class HinduCalendarHolidays:
+class HinduCalendarHolidays(EasternCalendarHolidays):
     """
     Hindu lunisolar calendar holidays.
     """
@@ -26,7 +27,7 @@ class HinduCalendarHolidays:
         self._hindu_calendar_show_estimated = show_estimated
 
     def _add_hindu_calendar_holiday(
-        self, name: str, dt_estimated: Tuple[date, bool]
+        self, name: str, dt_estimated: tuple[Optional[date], bool]
     ) -> Optional[date]:
         """
         Add Hindu calendar holiday.
@@ -34,14 +35,8 @@ class HinduCalendarHolidays:
         Adds customizable estimation label to holiday name if holiday date
         is an estimation.
         """
-        estimated_label = getattr(self, "estimated_label", "%s (estimated)")
-        dt, is_estimated = dt_estimated
-
-        return self._add_holiday(
-            self.tr(estimated_label) % self.tr(name)
-            if is_estimated and self._hindu_calendar_show_estimated
-            else name,
-            dt,
+        return self._add_eastern_calendar_holiday(
+            name, dt_estimated, self._hindu_calendar_show_estimated
         )
 
     def _add_diwali(self, name) -> Optional[date]:

holidays/groups/international.py

@@ -185,15 +185,18 @@ class InternationalHolidays:
         """
         return self._add_holiday_mar_8(name)
 
-    def _add_world_war_two_victory_day(self, name):
+    def _add_world_war_two_victory_day(self, name, is_western=True):
         """
-        Add Victory Day (May 9th)
+        Add Day of Victory in World War II in Europe (May 8).
+        https://en.wikipedia.org/wiki/Victory_in_Europe_Day
 
-        Victory Day is a holiday that commemorates the victory over Nazi
-        Germany in 1945.
+        Some Eastern European countries celebrate Victory Day on May 9.
         https://en.wikipedia.org/wiki/Victory_Day_(9_May)
         """
-        return self._add_holiday_may_9(name)
+        if is_western:
+            return self._add_holiday_may_8(name)
+        else:
+            return self._add_holiday_may_9(name)
 
     def _add_united_nations_day(self, name):
         """