Mypy improvement

.github/workflows/tests.yml

@@ -65,7 +65,10 @@ jobs:
         run: timeout 10s poetry run pip --version || rm -rf .venv
 
       - name: Install dependencies
-        run: poetry install --only main --only test -vvv
+        run: poetry install --only main --only test --only typing -vvv
+
+      - name: Run type checking
+        run: poetry run mypy
 
       - name: Test Pure Python
         run: |

.pre-commit-config.yaml

@@ -58,14 +58,3 @@ repos:
         exclude: ^build\.py$
         args:
           - --py37-plus
-
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.982
-    hooks:
-      - id: mypy
-        pass_filenames: false
-        exclude: ^build\.py$
-        additional_dependencies:
-          - pytest>=7.1.2
-          - types-backports
-          - types-python-dateutil

pendulum/__init__.py

@@ -73,7 +73,7 @@ def _safe_timezone(
     elif isinstance(obj, _datetime.tzinfo):
         # zoneinfo
         if hasattr(obj, "key"):
-            obj = obj.key  # type: ignore
+            obj = obj.key
         # pytz
         elif hasattr(obj, "localize"):
             obj = obj.zone  # type: ignore

pendulum/date.py

@@ -258,7 +258,7 @@ def __add__(self, other: timedelta) -> Date:
 
         return self._add_timedelta(other)
 
-    @overload
+    @overload  # type: ignore[override]
     def __sub__(self, delta: timedelta) -> Date:
         ...
 

pendulum/datetime.py

@@ -41,7 +41,7 @@
 from pendulum.utils._compat import PY38
 
 if TYPE_CHECKING:
-    from typing import Literal
+    from pendulum.utils._compat import Literal
 
 
 class DateTime(datetime.datetime, Date):
@@ -1349,7 +1349,7 @@ def __reduce__(
     ]:
         return self.__reduce_ex__(2)
 
-    def __reduce_ex__(  # type: ignore[override]
+    def __reduce_ex__(
         self, protocol: int
     ) -> tuple[
         type[DateTime], tuple[int, int, int, int, int, int, int, datetime.tzinfo | None]

pendulum/helpers.py

@@ -40,12 +40,12 @@
     from pendulum._extensions._helpers import timestamp
     from pendulum._extensions._helpers import week_day
 except ImportError:
-    from pendulum._extensions.helpers import PreciseDiff  # type: ignore[misc]
+    from pendulum._extensions.helpers import PreciseDiff  # type: ignore[assignment]
     from pendulum._extensions.helpers import days_in_year
     from pendulum._extensions.helpers import is_leap
     from pendulum._extensions.helpers import is_long_year
     from pendulum._extensions.helpers import local_time
-    from pendulum._extensions.helpers import precise_diff  # type: ignore[misc]
+    from pendulum._extensions.helpers import precise_diff  # type: ignore[assignment]
     from pendulum._extensions.helpers import timestamp
     from pendulum._extensions.helpers import week_day
 

pendulum/interval.py

@@ -18,10 +18,9 @@
 from pendulum.helpers import precise_diff
 
 if TYPE_CHECKING:
-    from typing import SupportsIndex
-
     from pendulum.helpers import PreciseDiff
     from pendulum.locales.locale import Locale  # noqa
+    from pendulum.utils._compat import SupportsIndex
 
 
 class Interval(Duration):

pendulum/parser.py

@@ -109,7 +109,7 @@ def _parse(text: str, **options: t.Any) -> Date | DateTime | Time | Duration | I
             ),
         )
 
-    if CDuration and isinstance(parsed, CDuration):
+    if CDuration and isinstance(parsed, CDuration):  # type: ignore[truthy-function]
         return pendulum.duration(
             years=parsed.years,
             months=parsed.months,

pendulum/parsing/__init__.py

@@ -26,8 +26,8 @@
     from pendulum.parsing._iso8601 import Duration
     from pendulum.parsing._iso8601 import parse_iso8601
 except ImportError:
-    from pendulum.duration import Duration  # type: ignore[misc]
-    from pendulum.parsing.iso8601 import parse_iso8601  # type: ignore[misc]
+    from pendulum.duration import Duration  # type: ignore[assignment]
+    from pendulum.parsing.iso8601 import parse_iso8601  # type: ignore[assignment]
 
 COMMON = re.compile(
     # Date (optional)  # noqa: E800

pendulum/time.py

@@ -19,7 +19,7 @@
 from pendulum.mixins.default import FormattableMixin
 
 if TYPE_CHECKING:
-    from typing import Literal
+    from pendulum.utils._compat import Literal
 
 
 class Time(FormattableMixin, time):
@@ -292,7 +292,7 @@ def __reduce__(
     ) -> tuple[type[Time], tuple[int, int, int, int, datetime.tzinfo | None]]:
         return self.__reduce_ex__(2)
 
-    def __reduce_ex__(  # type: ignore[override]
+    def __reduce_ex__(
         self, protocol: int
     ) -> tuple[type[Time], tuple[int, int, int, int, datetime.tzinfo | None]]:
         return self.__class__, self._get_state(protocol)

pendulum/tz/__init__.py

@@ -1,18 +1,12 @@
 from __future__ import annotations
 
-import sys
-
 from pendulum.tz.local_timezone import get_local_timezone
 from pendulum.tz.local_timezone import set_local_timezone
 from pendulum.tz.local_timezone import test_local_timezone
 from pendulum.tz.timezone import UTC
 from pendulum.tz.timezone import FixedTimezone
 from pendulum.tz.timezone import Timezone
-
-if sys.version_info >= (3, 9):
-    from importlib import resources
-else:
-    import importlib_resources as resources
+from pendulum.utils._compat import resources
 
 PRE_TRANSITION = "pre"
 POST_TRANSITION = "post"
@@ -27,7 +21,7 @@ def timezones() -> tuple[str, ...]:
     global _timezones
 
     if _timezones is None:
-        with resources.files("tzdata").joinpath("zones").open() as f:
+        with resources.files("tzdata").joinpath("zones").open() as f:  # type: ignore[no-untyped-call]
             _timezones = tuple(tz.strip() for tz in f.readlines())
 
     return _timezones

pendulum/tz/local_timezone.py

@@ -141,7 +141,7 @@ def _get_windows_timezone() -> Timezone:
 
 else:
 
-    def _get_windows_timezone() -> Timezone:
+    def _get_windows_timezone() -> Timezone:  # type: ignore[empty-body]
         ...
 
 

pendulum/utils/_compat.py

@@ -6,8 +6,20 @@
 PY38 = sys.version_info[:2] >= (3, 8)
 
 if sys.version_info < (3, 9):
+    import importlib_resources as resources
+
     from backports import zoneinfo
 else:
     import zoneinfo
 
-__all__ = ["zoneinfo"]
+    from importlib import resources
+
+
+if sys.version_info < (3, 8):
+    from typing_extensions import Literal
+    from typing_extensions import SupportsIndex
+else:
+    from typing import Literal
+    from typing import SupportsIndex
+
+__all__ = ["zoneinfo", "resources", "SupportsIndex", "Literal"]