Remove deprecated fix-encoding-pragma, add pyupgrade (#2007)

Co-authored-by: Arkadii Yakovets <[email protected]>

.pre-commit-config.yaml

@@ -8,18 +8,22 @@ repos:
       - id: end-of-file-fixer
         exclude_types:
           - rst
-      - id: fix-encoding-pragma
-        args:
-          - --remove
       - id: mixed-line-ending
         args:
           - --fix=lf
       - id: trailing-whitespace
         exclude_types:
           - rst
 
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.17.0
+    hooks:
+    -   id: pyupgrade
+        args:
+          - --py38-plus
+
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.5
+    rev: v0.6.6
     hooks:
       - id: ruff
       - id: ruff-format

holidays/calendars/gregorian.py

@@ -19,7 +19,7 @@
 
 JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC = range(1, 13)
 
-DAYS = set(str(d) for d in range(1, 32))
+DAYS = {str(d) for d in range(1, 32)}
 MONTHS = {
     m: i
     for i, m in enumerate(

holidays/calendars/thai.py

@@ -264,7 +264,7 @@ def __verify_calendar(calendar):
                 f"Unknown calendar name: {calendar}. Use `KHMER_CALENDAR` or `THAI_CALENDAR`."
             )
 
-    @lru_cache()
+    @lru_cache
     def _get_start_date(self, year: int) -> Optional[date]:
         """
         Calculate the start date of that particular Thai Lunar Calendar Year.

holidays/utils.py

@@ -306,7 +306,7 @@ def _list_localized_entities(entity_codes: Iterable[str]) -> Dict[str, List[str]
     return localized_countries
 
 
-@lru_cache()
+@lru_cache
 def list_localized_countries(include_aliases=True) -> Dict[str, List[str]]:
     """
     Get all localized countries and languages they support.
@@ -323,7 +323,7 @@ def list_localized_countries(include_aliases=True) -> Dict[str, List[str]]:
     return _list_localized_entities(EntityLoader.get_country_codes(include_aliases))
 
 
-@lru_cache()
+@lru_cache
 def list_localized_financial(include_aliases=True) -> Dict[str, List[str]]:
     """
     Get all localized financial markets and languages they support.
@@ -358,7 +358,7 @@ def _list_supported_entities(entity_codes: Iterable[str]) -> Dict[str, List[str]
     }
 
 
-@lru_cache()
+@lru_cache
 def list_supported_countries(include_aliases=True) -> Dict[str, List[str]]:
     """
     Get all supported countries and their subdivisions.
@@ -373,7 +373,7 @@ def list_supported_countries(include_aliases=True) -> Dict[str, List[str]]:
     return _list_supported_entities(EntityLoader.get_country_codes(include_aliases))
 
 
-@lru_cache()
+@lru_cache
 def list_supported_financial(include_aliases=True) -> Dict[str, List[str]]:
     """
     Get all supported financial markets and their subdivisions.

scripts/calendar/asian_generator.py

@@ -250,7 +250,7 @@ def __init__(self) -> None:
         self.LUNAR_END_DATE = (2099, 12, 30)
         self.SOLAR_END_DATE = date(2100, 2, 18)
 
-    @lru_cache()
+    @lru_cache
     def _get_leap_month(self, lunar_year: int) -> int:
         """
         Return the number of the leap month if one exists in the year,
@@ -275,7 +275,7 @@ def _lunar_year_days(self, year: int) -> int:
             days += day
         return days
 
-    @lru_cache()
+    @lru_cache
     def _span_days(self, year: int) -> int:
         """
         Return the number of days elapsed since self.SOLAR_START_DATE to the

scripts/generate_release_notes.py

@@ -246,7 +246,7 @@ def print_release_notes(self):
                     year=today.year,
                 )
             )
-            print("\n".join((f"- {pr[0]} ({pr[1]})" for pr in self.sorted_pull_requests)))
+            print("\n".join(f"- {pr[0]} ({pr[1]})" for pr in self.sorted_pull_requests))
 
         else:
             print(f"No changes since {self.latest_tag_name} release.")

tests/common.py

@@ -222,7 +222,7 @@ def _assertHolidays(self, instance_name, *args):  # noqa: N802
         self.assertEqual(
             len(holidays),
             len(expected_holidays),
-            set((dt.strftime("%Y-%m-%d"), name) for dt, name in holidays.items()).difference(
+            {(dt.strftime("%Y-%m-%d"), name) for dt, name in holidays.items()}.difference(
                 (dt, name) for dt, name in expected_holidays
             ),
         )

tests/countries/test_finland.py

@@ -168,7 +168,7 @@ def test_all_saints_day(self):
         )
 
     def _test_unofficial_holiday(self, name, since):
-        start_year, month, day = [int(part) for part in since.split("-")]
+        start_year, month, day = (int(part) for part in since.split("-"))
         self.assertHolidayName(
             name,
             self.unofficial_holidays,

tests/test_docs.py

@@ -136,7 +136,7 @@ def test_supported_countries_table(self):
             ),
         )
 
-        country_names = set(c.split("(the)")[0] for c in country_names)
+        country_names = {c.split("(the)")[0] for c in country_names}
         supported_countries = list_supported_countries(include_aliases=False)
         localized_countries = list_localized_countries(include_aliases=False)
         for country_code in supported_countries:

tests/test_l10n.py

@@ -79,5 +79,5 @@ def test_localization(self):
             self.assertFalse(
                 obsolete_entries,
                 f"The {entity_code} {language} localization contains obsolete entries: "
-                f"{', '.join((oe.msgid for oe in obsolete_entries))}",
+                f"{', '.join(oe.msgid for oe in obsolete_entries)}",
             )

tests/test_registry.py

@@ -48,9 +48,9 @@ def test_countries_imports(self):
 
                 loader_entities.add(loader_cls.__name__)
 
-        countries_entities = set(
+        countries_entities = {
             entity[0] for entity in inspect.getmembers(countries, inspect.isclass)
-        )
+        }
         self.assertEqual(
             countries_entities,
             loader_entities,
@@ -89,9 +89,9 @@ def test_financial_imports(self):
 
                 loader_entities.add(loader_cls.__name__)
 
-        financial_entities = set(
+        financial_entities = {
             entity[0] for entity in inspect.getmembers(financial, inspect.isclass)
-        )
+        }
         self.assertEqual(
             financial_entities,
             loader_entities,