holidays 0.46__py3-none-any.whl → 0.48__py3-none-any.whl

holidays/countries/palau.py

@@ -0,0 +1,127 @@
+#  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/python-holidays
+#  License: MIT (see LICENSE file)
+
+from holidays.calendars.gregorian import SEP, NOV
+from holidays.constants import ARMED_FORCES, HALF_DAY, PUBLIC
+from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
+from holidays.observed_holiday_base import ObservedHolidayBase, SAT_TO_PREV_FRI, SUN_TO_NEXT_MON
+
+
+class Palau(ObservedHolidayBase, ChristianHolidays, InternationalHolidays):
+    """
+    References:
+    - http://www.paclii.org/pw/legis/consol_act/gpt1262/  # Chapter 7, Holidays.
+    - https://www.palaugov.pw/wp-content/uploads/2017/11/RPPL-No.-10-15-re.-Family-Day-Holiday.pdf
+    - https://www.facebook.com/PalauPresident/posts/195883107230463 # EO336 Memorial Day repealed
+    - https://www.taiwanembassy.org/pal_en/post/792.html # Earliest source for President's Day
+
+    If any of the holidays enumerated in section 701 of this chapter falls on Sunday, the
+    following Monday shall be observed as a holiday. If any of the holidays enumerated in
+    section 701 of this chapter falls on Saturday, the preceding Friday shall be observed
+    as a holiday.
+
+    As there's no record of President's Day (Jun 1) and Independence Day (Oct 1) being
+    legal holiday before 2017, as seen in RPRL 10-15, they shall be assumed to start in 2018
+    for our current implementation.
+    """
+
+    country = "PW"
+    supported_categories = (ARMED_FORCES, HALF_DAY, PUBLIC)
+    observed_label = "%s (observed)"
+
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        StaticHolidays.__init__(self, PalauStaticHolidays)
+        kwargs.setdefault("observed_rule", SAT_TO_PREV_FRI + SUN_TO_NEXT_MON)
+        super().__init__(*args, **kwargs)
+
+    def _populate_public_holidays(self):
+        # Republic of Palau Public Law No. 2-15.
+        # The legislation was first adopted by the 2nd Olbiil Era Kelulau (1984-1988),
+        # but since we cannot find any info on its actual adoption date, we may as
+        # well use the formation date of the country as the placeholder cut-off date.
+        if self._year <= 1980:
+            return None
+
+        # Fixed Date Public Holidays.
+
+        # New Year's Day.
+        name = "New Year's Day"
+        self._add_observed(self._add_new_years_day(name))
+        self._add_observed(self._next_year_new_years_day, name=name, rule=SAT_TO_PREV_FRI)
+
+        # Youth Day.
+        self._add_observed(self._add_holiday_mar_15("Youth Day"))
+
+        # Senior Citizens Day.
+        self._add_observed(self._add_holiday_may_5("Senior Citizens Day"))
+
+        if self._year in {2011, 2012}:
+            # Memorial Day.
+            self._add_holiday_last_mon_of_may("Memorial Day")
+
+        if self._year >= 2018:
+            # President's Day.
+            self._add_observed(self._add_holiday_jun_1("President's Day"))
+
+        # Constitution Day.
+        self._add_observed(self._add_holiday_jul_9("Constitution Day"))
+
+        # Labor Day.
+        self._add_holiday_1st_mon_of_sep("Labor Day")
+
+        if self._year >= 2018:
+            # Independence Day.
+            self._add_observed(self._add_holiday_oct_1("Independence Day"))
+
+        # United Nations Day.
+        self._add_observed(self._add_united_nations_day("United Nations Day"))
+
+        # Thanksgiving Day.
+        self._add_holiday_4th_thu_of_nov("Thanksgiving Day")
+
+        if self._year >= 2017:
+            # Family Day.
+            self._add_holiday_4th_fri_of_nov("Family Day")
+
+        # Christmas Day.
+        self._add_observed(self._add_christmas_day("Christmas Day"))
+
+
+class PW(Palau):
+    pass
+
+
+class PLW(Palau):
+    pass
+
+
+class PalauStaticHolidays:
+    """
+    Sources:
+     - https://www.facebook.com/photo?fbid=1774513196034105&set=a.175933635892077
+     - https://www.facebook.com/photo/?fbid=1794692910682800&set=a.175933635892077
+     - https://www.facebook.com/photo/?fbid=1408133829338712&set=a.175933635892077
+    """
+
+    special_armed_forces_holidays = {
+        2020: (NOV, 11, "Veterans Day"),
+    }
+
+    special_half_day_holidays = {
+        2019: (SEP, 30, "Preparation for the 25th Independence Day of the Republic of Palau"),
+    }
+
+    special_public_holidays = {
+        2020: (NOV, 3, "National Day of Democracy"),
+    }

holidays/countries/poland.py

@@ -10,7 +10,6 @@
 #  Website: https://github.com/vacanza/python-holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import timedelta as td
 from gettext import gettext as tr
 
 from holidays.calendars.gregorian import NOV
@@ -68,7 +67,7 @@ class Poland(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolida
 
         if self._year <= 1950:
             # Ascension Day.
-            self._add_holiday(tr("Wniebowstąpienie Pańskie"), self._easter_sunday + td(days=+40))
+            self._add_ascension_thursday(tr("Wniebowstąpienie Pańskie"))
 
         # Pentecost.
         self._add_whit_sunday(tr("Zielone Świątki"))

holidays/countries/portugal.py

@@ -10,7 +10,6 @@
 #  Website: https://github.com/vacanza/python-holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import timedelta as td
 from gettext import gettext as tr
 
 from holidays.constants import OPTIONAL, PUBLIC
@@ -184,11 +183,8 @@ class Portugal(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_aug_22(tr("Dia de Nossa Senhora das Graças"))
 
     def _populate_subdiv_05_public_holidays(self):
-        self._add_holiday(
-            # Feast of Our Lady of Mércoles.
-            tr("Dia de Nossa Senhora de Mércoles"),
-            self._easter_sunday + td(days=+16),
-        )
+        # Feast of Our Lady of Mércoles.
+        self._add_holiday_16_days_past_easter(tr("Dia de Nossa Senhora de Mércoles"))
 
     def _populate_subdiv_06_public_holidays(self):
         # St. Elizabeth's Day.

holidays/countries/south_africa.py

@@ -20,6 +20,7 @@ class SouthAfrica(ObservedHolidayBase, ChristianHolidays, InternationalHolidays,
     https://www.gov.za/about-sa/public-holidays
     https://en.wikipedia.org/wiki/Public_holidays_in_South_Africa
     https://www.gov.za/speeches/president-cyril-ramaphosa-progress-economic-recovery-30-oct-2023-0000
+    https://www.gov.za/documents/notices/public-holidays-act-declaration-29-may-2024-public-holiday-23-feb-2024
     """
 
     country = "ZA"
@@ -147,6 +148,7 @@ class SouthAfricaStaticHolidays:
         2022: (DEC, 27, presidential_decree_holiday),
         # Winning the 2023 Rugby World Cup
         2023: (DEC, 15, presidential_decree_holiday),
+        2024: (MAY, 29, national_and_provincial_elections),
     }
 
     special_public_holidays_observed = {

holidays/countries/south_korea.py

@@ -198,7 +198,7 @@ class SouthKorea(
 
         if 1950 <= self._year <= 1975:
             # United Nations Day.
-            self._add_holiday_oct_24(tr("국제연합일"))
+            self._add_united_nations_day(tr("국제연합일"))
 
         # Chuseok.
         name = tr("추석")

holidays/countries/tanzania.py

@@ -264,6 +264,7 @@ class TanzaniaIslamicHolidays(_CustomIslamicHolidays):
         2021: (MAY, 14),
         2022: (MAY, 3),
         2023: (APR, 22),
+        2024: (APR, 10),
     }
 
     MAWLID_DATES = {

holidays/countries/timor_leste.py

@@ -31,10 +31,11 @@ class TimorLeste(
     References:
     - https://mj.gov.tl/jornal/lawsTL/RDTL-Law/RDTL-Laws/Law-2005-10.pdf  # 2005 Law
     - http://timor-leste.gov.tl/?p=14494&lang=en  # 2016 Amendment
+    - http://timor-leste.gov.tl/?p=30266&lang=en  # 2022
     - http://timor-leste.gov.tl/?p=31750&lang=en  # 2023 (en_US)
     - http://timor-leste.gov.tl/?p=31750&lang=pt  # 2023 (pt_PT)
     - http://timor-leste.gov.tl/?p=31750&lang=tp  # 2023 (tet)
-    - http://timor-leste.gov.tl/?p=30266&lang=en  # 2022
+    - http://timor-leste.gov.tl/?p=35833&lang=en  # 2024
 
     Limitations:
 
@@ -201,6 +202,7 @@ class TimorLesteIslamicHolidays(_CustomIslamicHolidays):
         2021: (JUL, 19),
         2022: (JUL, 9),
         2023: (JUN, 29),
+        2024: (JUN, 17),
     }
 
     EID_AL_FITR_DATES = {
@@ -217,6 +219,7 @@ class TimorLesteIslamicHolidays(_CustomIslamicHolidays):
         2021: (MAY, 13),
         2022: (MAY, 2),
         2023: (APR, 22),
+        2024: (APR, 10),
     }
 
 
@@ -395,20 +398,28 @@ class TimorLesteStaticHolidays:
             (JAN, 2, special_national_holidays),
             # http://timor-leste.gov.tl/?p=23607&lang=en
             (FEB, 26, special_national_holidays),
+            # http://timor-leste.gov.tl/?p=25455&lang=en
+            (AUG, 20, special_national_holidays),
             # http://timor-leste.gov.tl/?p=25502&lang=en
             (AUG, 31, special_national_holidays),
             # http://timor-leste.gov.tl/?p=26030&lang=en
             (NOV, 3, special_national_holidays),
+            # http://timor-leste.gov.tl/?p=26365&lang=en
+            (DEC, 24, special_national_holidays),
         ),
         2021: (
             # http://timor-leste.gov.tl/?p=26865&lang=en
             (FEB, 12, special_national_holidays),
+            # http://timor-leste.gov.tl/?p=26896&lang=en
+            (FEB, 17, special_national_holidays),
             # http://timor-leste.gov.tl/?p=29682&lang=en
             (NOV, 3, special_national_holidays),
         ),
         2022: (
             # http://timor-leste.gov.tl/?p=30029&lang=en
             (FEB, 1, special_national_holidays),
+            # http://timor-leste.gov.tl/?p=30194&lang=en
+            (MAR, 2, special_national_holidays),
             # http://timor-leste.gov.tl/?p=30254&lang=en
             (MAR, 18, presidential_election),
             # http://timor-leste.gov.tl/?p=30429&lang=en
@@ -416,11 +427,23 @@ class TimorLesteStaticHolidays:
             (APR, 18, presidential_election),
             (APR, 19, presidential_election),
             (APR, 20, presidential_election),
+            # http://timor-leste.gov.tl/?p=31404&lang=en
+            (OCT, 31, special_national_holidays),
+            # http://timor-leste.gov.tl/?p=31574&lang=en
+            (DEC, 9, special_national_holidays),
+            # http://timor-leste.gov.tl/?p=31633&lang=en
+            (DEC, 26, special_national_holidays),
         ),
         2023: (
             # http://timor-leste.gov.tl/?p=31641&lang=en
             (JAN, 2, special_national_holidays),
             # http://timor-leste.gov.tl/?p=31798&lang=en
             (JAN, 23, special_national_holidays),
+            # http://timor-leste.gov.tl/?p=32191&lang=en
+            (FEB, 22, special_national_holidays),
+        ),
+        2024: (
+            # http://timor-leste.gov.tl/?p=36002&lang=en
+            (FEB, 14, special_national_holidays),
         ),
     }

holidays/countries/united_arab_emirates.py

@@ -118,6 +118,7 @@ class UnitedArabEmiratesIslamicHolidays(_CustomIslamicHolidays):
         2021: (MAY, 13),
         2022: (MAY, 2),
         2023: (APR, 21),
+        2024: (APR, 10),
     }
 
     HIJRI_NEW_YEAR_DATES = {

holidays/countries/united_states.py

@@ -609,7 +609,7 @@ class UnitedStates(ObservedHolidayBase, ChristianHolidays, InternationalHolidays
 
         # Confederate Memorial Day
         if self._year >= 1866:
-            self._add_holiday_4th_mon_of_apr("Confederate Memorial Day")
+            self._add_holiday_last_mon_of_apr("Confederate Memorial Day")
 
     def _populate_subdiv_mt_public_holidays(self):
         # Election Day

holidays/countries/uruguay.py

@@ -11,7 +11,6 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from datetime import timedelta as td
 from gettext import gettext as tr
 
 from holidays.calendars.gregorian import MAR
@@ -123,9 +122,9 @@ class Uruguay(ObservedHolidayBase, ChristianHolidays, InternationalHolidays, Sta
 
         # Tourism Week.
         name = tr("Semana de Turismo")
-        self._add_holiday(name, self._easter_sunday + td(days=-6))
-        self._add_holiday(name, self._easter_sunday + td(days=-5))
-        self._add_holiday(name, self._easter_sunday + td(days=-4))
+        self._add_holiday_6_days_prior_easter(name)
+        self._add_holiday_5_days_prior_easter(name)
+        self._add_holiday_4_days_prior_easter(name)
         self._add_holy_thursday(name)
         self._add_good_friday(name)
 

holidays/countries/uzbekistan.py

@@ -144,6 +144,7 @@ class UzbekistanIslamicHolidays(_CustomIslamicHolidays):
         2021: (MAY, 13),
         2022: (MAY, 2),
         2023: (APR, 21),
+        2024: (APR, 10),
     }
 
 

holidays/financial/european_central_bank.py

@@ -10,22 +10,30 @@
 #  Website: https://github.com/vacanza/python-holidays
 #  License: MIT (see LICENSE file)
 
-from holidays.groups import ChristianHolidays, InternationalHolidays
+from holidays.calendars.gregorian import DEC
+from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
 from holidays.holiday_base import HolidayBase
 
 
 class EuropeanCentralBank(HolidayBase, ChristianHolidays, InternationalHolidays):
-    # https://en.wikipedia.org/wiki/TARGET2
-    # http://www.ecb.europa.eu/press/pr/date/2000/html/pr001214_4.en.html
+    """
+    References:
+        - https://en.wikipedia.org/wiki/TARGET2
+        - https://www.ecb.europa.eu/press/pr/date/1999/html/pr990715_1.en.html
+        - https://www.ecb.europa.eu/press/pr/date/2000/html/pr001214_4.en.html
+    """
 
     market = "ECB"
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
         InternationalHolidays.__init__(self)
+        StaticHolidays.__init__(self, EuropeanCentralBankStaticHolidays)
         super().__init__(*args, **kwargs)
 
     def _populate(self, year):
+        if year <= 1999:
+            return None
         super()._populate(year)
 
         self._add_new_years_day("New Year's Day")
@@ -45,3 +53,9 @@ class ECB(EuropeanCentralBank):
 
 class TAR(EuropeanCentralBank):
     pass
+
+
+class EuropeanCentralBankStaticHolidays:
+    special_public_holidays = {
+        2000: (DEC, 31, "Additional closing day"),
+    }

holidays/groups/international.py

@@ -194,3 +194,13 @@ class InternationalHolidays:
         https://en.wikipedia.org/wiki/Victory_Day_(9_May)
         """
         return self._add_holiday_may_9(name)
+
+    def _add_united_nations_day(self, name):
+        """
+        Add United Nations Day (Oct 24th)
+
+        United Nations Day is an annual commemorative day, reflecting the
+        official creation of the United Nations on 24 October 1945.
+        https://en.wikipedia.org/wiki/United_Nations_Day
+        """
+        return self._add_holiday_oct_24(name)

holidays/holiday_base.py

@@ -13,7 +13,6 @@
 __all__ = ("DateLike", "HolidayBase", "HolidaySum")
 
 import copy
-import re
 import warnings
 from calendar import isleap
 from datetime import date, datetime, timedelta, timezone
@@ -24,7 +23,6 @@ from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union, cast
 
 from dateutil.parser import parse
 
-from holidays.calendars import gregorian
 from holidays.calendars.gregorian import (
     MON,
     TUE,
@@ -35,6 +33,9 @@ from holidays.calendars.gregorian import (
     SUN,
     _get_nth_weekday_from,
     _get_nth_weekday_of_month,
+    DAYS,
+    MONTHS,
+    WEEKDAYS,
 )
 from holidays.constants import HOLIDAY_NAME_DELIMITER, PUBLIC
 from holidays.helpers import _normalize_arguments, _normalize_tuple
@@ -230,6 +231,8 @@ class HolidayBase(Dict[date, str]):
     ones."""
     weekend: Set[int] = {SAT, SUN}
     """Country weekend days."""
+    weekend_workdays: Set[date] = set()
+    """Working days moved to weekends."""
     default_category: str = PUBLIC
     """The entity category used by default."""
     default_language: Optional[str] = None
@@ -353,6 +356,7 @@ class HolidayBase(Dict[date, str]):
         self.language = language.lower() if language else None
         self.observed = observed
         self.subdiv = subdiv
+        self.weekend_workdays = set()
 
         supported_languages = set(self.supported_languages)
         self.tr = (
@@ -427,77 +431,103 @@ class HolidayBase(Dict[date, str]):
         except AttributeError as e:
             # This part is responsible for _add_holiday_* syntactic sugar support.
             add_holiday_prefix = "_add_holiday_"
-            # Raise early if prefix doesn't match to avoid regex checks.
+            # Raise early if prefix doesn't match to avoid patterns checks.
             if name[: len(add_holiday_prefix)] != add_holiday_prefix:
                 raise e
 
+            tokens = name.split("_")
+
             # Handle <month> <day> patterns (e.g., _add_holiday_jun_15()).
-            month_day = re.match(r"_add_holiday_(\w{3})_(\d{1,2})", name)
-            if month_day:
-                month, day = month_day.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    date(self._year, getattr(gregorian, month.upper()), int(day)),
-                )
+            if len(tokens) == 5:
+                *_, month, day = tokens
+                if month in MONTHS and day in DAYS:
+                    return lambda name: self._add_holiday(
+                        name,
+                        date(self._year, MONTHS[month], int(day)),
+                    )
 
-            # Handle <last/nth> <weekday> of <month> patterns (e.g.,
-            # _add_holiday_last_mon_of_aug() or _add_holiday_3rd_fri_of_aug()).
-            nth_weekday_of_month = re.match(
-                r"_add_holiday_(last|\d\w{2})_(\w{3})_of_(\w{3})", name
-            )
-            if nth_weekday_of_month:
-                number, weekday, month = nth_weekday_of_month.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    _get_nth_weekday_of_month(
-                        -1 if number == "last" else +int(re.sub(r"\D", "", number)),
-                        getattr(gregorian, weekday.upper()),
-                        getattr(gregorian, month.upper()),
-                        self._year,
-                    ),
-                )
+            elif len(tokens) == 7:
+                # Handle <last/nth> <weekday> of <month> patterns (e.g.,
+                # _add_holiday_last_mon_of_aug() or _add_holiday_3rd_fri_of_aug()).
+                *_, number, weekday, of, month = tokens
+                if (
+                    of == "of"
+                    and (number == "last" or number[0].isdigit())
+                    and month in MONTHS
+                    and weekday in WEEKDAYS
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        _get_nth_weekday_of_month(
+                            -1 if number == "last" else int(number[0]),
+                            WEEKDAYS[weekday],
+                            MONTHS[month],
+                            self._year,
+                        ),
+                    )
+
+                # Handle <n> days <past/prior> easter patterns (e.g.,
+                # _add_holiday_8_days_past_easter() or
+                # _add_holiday_5_days_prior_easter()).
+                *_, days, unit, delta_direction, easter = tokens
+                if (
+                    unit in {"day", "days"}
+                    and delta_direction in {"past", "prior"}
+                    and easter == "easter"
+                    and len(days) < 3
+                    and days.isdigit()
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        self._easter_sunday
+                        + timedelta(days=+int(days) if delta_direction == "past" else -int(days)),
+                    )
 
             # Handle <n> day(s) <past/prior> <last/<nth> <weekday> of <month> patterns (e.g.,
             # _add_holiday_1_day_past_1st_fri_of_aug() or
             # _add_holiday_5_days_prior_last_fri_of_aug()).
-            nth_weekday_of_month_with_delta = re.match(
-                r"_add_holiday_(\d{1,2})_days?_(past|prior)_(last|\d\w{2})_(\w{3})_of_(\w{3})",
-                name,
-            )
-            if nth_weekday_of_month_with_delta:
-                (
-                    days,
-                    delta_direction,
-                    number,
-                    weekday,
-                    month,
-                ) = nth_weekday_of_month_with_delta.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    _get_nth_weekday_of_month(
-                        -1 if number == "last" else +int(re.sub(r"\D", "", number)),
-                        getattr(gregorian, weekday.upper()),
-                        getattr(gregorian, month.upper()),
-                        self._year,
+            elif len(tokens) == 10:
+                *_, days, unit, delta_direction, number, weekday, of, month = tokens
+                if (
+                    unit in {"day", "days"}
+                    and delta_direction in {"past", "prior"}
+                    and of == "of"
+                    and len(days) < 3
+                    and days.isdigit()
+                    and (number == "last" or number[0].isdigit())
+                    and month in MONTHS
+                    and weekday in WEEKDAYS
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        _get_nth_weekday_of_month(
+                            -1 if number == "last" else int(number[0]),
+                            WEEKDAYS[weekday],
+                            MONTHS[month],
+                            self._year,
+                        )
+                        + timedelta(days=+int(days) if delta_direction == "past" else -int(days)),
                     )
-                    + timedelta(days=+int(days) if delta_direction == "past" else -int(days)),
-                )
 
             # Handle <nth> <weekday> <before/from> <month> <day> patterns (e.g.,
             # _add_holiday_1st_mon_before_jun_15() or _add_holiday_1st_mon_from_jun_15()).
-            nth_weekday_from = re.match(
-                r"_add_holiday_(\d{1,2})\w{2}_(\w+)_(before|from)_(\w{3})_(\d{1,2})", name
-            )
-            if nth_weekday_from:
-                number, weekday, date_direction, month, day = nth_weekday_from.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    _get_nth_weekday_from(
-                        -int(number) if date_direction == "before" else +int(number),
-                        getattr(gregorian, weekday.upper()),
-                        date(self._year, getattr(gregorian, month.upper()), int(day)),
-                    ),
-                )
+            elif len(tokens) == 8:
+                *_, number, weekday, date_direction, month, day = tokens
+                if (
+                    date_direction in {"before", "from"}
+                    and number[0].isdigit()
+                    and month in MONTHS
+                    and weekday in WEEKDAYS
+                    and day in DAYS
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        _get_nth_weekday_from(
+                            -int(number[0]) if date_direction == "before" else +int(number[0]),
+                            WEEKDAYS[weekday],
+                            date(self._year, MONTHS[month], int(day)),
+                        ),
+                    )
 
             raise e  # No match.
 
@@ -676,9 +706,13 @@ class HolidayBase(Dict[date, str]):
             .lower()
         )
 
-    @cached_property
+    @property
     def _sorted_categories(self):
-        return sorted(self.categories)
+        return (
+            [self.default_category] + sorted(self.categories - {self.default_category})
+            if self.default_category in self.categories
+            else sorted(self.categories)
+        )
 
     @classmethod
     def get_subdivision_aliases(cls) -> Dict[str, List]:
@@ -724,14 +758,14 @@ class HolidayBase(Dict[date, str]):
                     )
                 else:  # Substituted holidays.
                     to_month, to_day, from_month, from_day, *optional = data
+                    from_date = date(optional[0] if optional else self._year, from_month, from_day)
                     self._add_holiday(
                         self.tr(self.substituted_label)
-                        % date(
-                            optional[0] if optional else self._year, from_month, from_day
-                        ).strftime(self.tr(self.substituted_date_format)),
+                        % from_date.strftime(self.tr(self.substituted_date_format)),
                         to_month,
                         to_day,
                     )
+                    self.weekend_workdays.add(from_date)
 
     def _check_weekday(self, weekday: int, *args) -> bool:
         """
@@ -922,6 +956,36 @@ class HolidayBase(Dict[date, str]):
 
         raise AttributeError(f"Unknown lookup type: {lookup}")
 
+    def get_nth_workday(self, key: DateLike, n: int) -> date:
+        """Return n-th working day from provided date (if n is positive)
+        or n-th working day before provided date (if n is negative).
+        """
+        direction = +1 if n > 0 else -1
+        dt = self.__keytransform__(key)
+        for _ in range(abs(n)):
+            dt += timedelta(days=direction)
+            while not self.is_workday(dt):
+                dt += timedelta(days=direction)
+        return dt
+
+    def get_workdays_number(self, key1: DateLike, key2: DateLike) -> int:
+        """Return the number of working days between two dates (not including the start date)."""
+        dt1 = self.__keytransform__(key1)
+        dt2 = self.__keytransform__(key2)
+        if dt1 == dt2:
+            return 0
+        if dt1 > dt2:
+            dt1, dt2 = dt2, dt1
+
+        return sum(
+            self.is_workday(dt1 + timedelta(days=n)) for n in range(1, (dt2 - dt1).days + 1)
+        )
+
+    def is_workday(self, key: DateLike) -> bool:
+        """Return True if date is a working day (not a holiday or a weekend)."""
+        dt = self.__keytransform__(key)
+        return dt in self.weekend_workdays if self._is_weekend(dt) else dt not in self
+
     def pop(self, key: DateLike, default: Union[str, Any] = None) -> Union[str, Any]:
         """If date is a holiday, remove it and return its date, else return
         default.