Use Mypy's strict mode

Author: adamchainz

.pre-commit-config.yaml

@@ -73,3 +73,7 @@ repos:
   rev: v1.15.0
   hooks:
   - id: mypy
+    additional_dependencies:
+    - django-stubs==5.0.4
+    - mysqlclient
+    - pytest==8.3.2

pyproject.toml

@@ -108,20 +108,19 @@ enable_error_code = [
   "redundant-expr",
   "truthy-bool",
 ]
-check_untyped_defs = true
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_untyped_defs = true
 mypy_path = "src/"
 namespace_packages = false
-no_implicit_optional = true
+plugins = [ "mypy_django_plugin.main" ]
+strict = true
 warn_unreachable = true
-warn_unused_ignores = true
 
 [[tool.mypy.overrides]]
 module = "tests.*"
 allow_untyped_defs = true
 
+[tool.django-stubs]
+django_settings_module = "tests.settings"
+
 [tool.rstcheck]
 ignore_directives = [
   "automodule",

src/django_mysql/models/__init__.py

@@ -4,7 +4,7 @@
 from django_mysql.models.aggregates import BitOr
 from django_mysql.models.aggregates import BitXor
 from django_mysql.models.aggregates import GroupConcat
-from django_mysql.models.base import Model  # noqa
+from django_mysql.models.base import Model
 from django_mysql.models.expressions import ListF
 from django_mysql.models.expressions import SetF
 from django_mysql.models.fields import Bit1BooleanField
@@ -27,3 +27,31 @@
 from django_mysql.models.query import SmartIterator
 from django_mysql.models.query import add_QuerySetMixin
 from django_mysql.models.query import pt_visual_explain
+
+__all__ = (
+    "add_QuerySetMixin",
+    "ApproximateInt",
+    "Bit1BooleanField",
+    "BitAnd",
+    "BitOr",
+    "BitXor",
+    "DynamicField",
+    "EnumField",
+    "FixedCharField",
+    "GroupConcat",
+    "ListCharField",
+    "ListF",
+    "ListTextField",
+    "Model",
+    "NullBit1BooleanField",
+    "pt_visual_explain",
+    "QuerySet",
+    "QuerySetMixin",
+    "SetCharField",
+    "SetF",
+    "SetTextField",
+    "SizedBinaryField",
+    "SizedTextField",
+    "SmartChunkedIterator",
+    "SmartIterator",
+)

src/django_mysql/models/fields/__init__.py

@@ -14,7 +14,7 @@
 from django_mysql.models.fields.tiny_integer import PositiveTinyIntegerField
 from django_mysql.models.fields.tiny_integer import TinyIntegerField
 
-__all__ = [
+__all__ = (
     "Bit1BooleanField",
     "DynamicField",
     "EnumField",
@@ -28,4 +28,4 @@
     "SizedBinaryField",
     "SizedTextField",
     "TinyIntegerField",
-]
+)

src/django_mysql/models/fields/dynamic.py

@@ -23,9 +23,9 @@
 from django.forms import Field as FormField
 from django.utils.translation import gettext_lazy as _
 
-from django_mysql.checks import mysql_connections
 from django_mysql.models.lookups import DynColHasKey
 from django_mysql.typing import DeconstructResult
+from django_mysql.utils import mysql_connections
 
 try:
     import mariadb_dyncol
@@ -87,7 +87,7 @@ def check(self, **kwargs: Any) -> list[checks.CheckMessage]:
         return errors
 
     def _check_mariadb_dyncol(self) -> list[checks.CheckMessage]:
-        errors = []
+        errors: list[checks.CheckMessage] = []
         if mariadb_dyncol is None:
             errors.append(
                 checks.Error(
@@ -100,7 +100,7 @@ def _check_mariadb_dyncol(self) -> list[checks.CheckMessage]:
         return errors
 
     def _check_mariadb_version(self) -> list[checks.CheckMessage]:
-        errors = []
+        errors: list[checks.CheckMessage] = []
 
         any_conn_works = any(
             (conn.vendor == "mysql" and conn.mysql_is_mariadb)
@@ -119,7 +119,7 @@ def _check_mariadb_version(self) -> list[checks.CheckMessage]:
         return errors
 
     def _check_character_set(self) -> list[checks.CheckMessage]:
-        errors = []
+        errors: list[checks.CheckMessage] = []
 
         conn = None
         for _alias, check_conn in mysql_connections():
@@ -151,7 +151,7 @@ def _check_character_set(self) -> list[checks.CheckMessage]:
     def _check_spec_recursively(
         self, spec: Any, path: str = ""
     ) -> list[checks.CheckMessage]:
-        errors = []
+        errors: list[checks.CheckMessage] = []
 
         if not isinstance(spec, dict):
             errors.append(

src/django_mysql/operations.py

@@ -2,7 +2,7 @@
 
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.migrations.operations.base import Operation
-from django.db.migrations.state import ModelState
+from django.db.migrations.state import ProjectState
 from django.utils.functional import cached_property
 
 
@@ -15,15 +15,15 @@ def __init__(self, name: str, soname: str) -> None:
         self.name = name
         self.soname = soname
 
-    def state_forwards(self, app_label: str, state: ModelState) -> None:
+    def state_forwards(self, app_label: str, state: ProjectState) -> None:
         pass  # pragma: no cover
 
     def database_forwards(
         self,
         app_label: str,
         schema_editor: BaseDatabaseSchemaEditor,
-        from_st: ModelState,
-        to_st: ModelState,
+        from_st: ProjectState,
+        to_st: ProjectState,
     ) -> None:
         if not self.plugin_installed(schema_editor):
             schema_editor.execute(
@@ -34,8 +34,8 @@ def database_backwards(
         self,
         app_label: str,
         schema_editor: BaseDatabaseSchemaEditor,
-        from_st: ModelState,
-        to_st: ModelState,
+        from_st: ProjectState,
+        to_st: ProjectState,
     ) -> None:
         if self.plugin_installed(schema_editor):
             schema_editor.execute("UNINSTALL PLUGIN %s" % self.name)
@@ -63,24 +63,24 @@ class InstallSOName(Operation):
     def __init__(self, soname: str) -> None:
         self.soname = soname
 
-    def state_forwards(self, app_label: str, state: ModelState) -> None:
+    def state_forwards(self, app_label: str, state: ProjectState) -> None:
         pass  # pragma: no cover
 
     def database_forwards(
         self,
         app_label: str,
         schema_editor: BaseDatabaseSchemaEditor,
-        from_st: ModelState,
-        to_st: ModelState,
+        from_st: ProjectState,
+        to_st: ProjectState,
     ) -> None:
         schema_editor.execute("INSTALL SONAME %s", (self.soname,))
 
     def database_backwards(
         self,
         app_label: str,
         schema_editor: BaseDatabaseSchemaEditor,
-        from_st: ModelState,
-        to_st: ModelState,
+        from_st: ProjectState,
+        to_st: ProjectState,
     ) -> None:
         schema_editor.execute("UNINSTALL SONAME %s", (self.soname,))
 
@@ -100,24 +100,24 @@ def __init__(
     def reversible(self) -> bool:
         return self.from_engine is not None
 
-    def state_forwards(self, app_label: str, state: ModelState) -> None:
+    def state_forwards(self, app_label: str, state: ProjectState) -> None:
         pass
 
     def database_forwards(
         self,
         app_label: str,
         schema_editor: BaseDatabaseSchemaEditor,
-        from_state: ModelState,
-        to_state: ModelState,
+        from_state: ProjectState,
+        to_state: ProjectState,
     ) -> None:
         self._change_engine(app_label, schema_editor, to_state, engine=self.engine)
 
     def database_backwards(
         self,
         app_label: str,
         schema_editor: BaseDatabaseSchemaEditor,
-        from_state: ModelState,
-        to_state: ModelState,
+        from_state: ProjectState,
+        to_state: ProjectState,
     ) -> None:
         if self.from_engine is None:
             raise NotImplementedError("You cannot reverse this operation")
@@ -128,7 +128,7 @@ def _change_engine(
         self,
         app_label: str,
         schema_editor: BaseDatabaseSchemaEditor,
-        to_state: ModelState,
+        to_state: ProjectState,
         engine: str,
     ) -> None:
         new_model = to_state.apps.get_model(app_label, self.name)

src/django_mysql/status.py

@@ -6,7 +6,6 @@
 from django.db import connections
 from django.db.backends.utils import CursorWrapper
 from django.db.utils import DEFAULT_DB_ALIAS
-from django.utils.functional import SimpleLazyObject
 
 from django_mysql.exceptions import TimeoutError
 
@@ -16,6 +15,7 @@ class BaseStatus:
     Base class for the status classes
     """
 
+    __slots__ = ("db",)
     query = ""
 
     def __init__(self, using: str | None = None) -> None:
@@ -127,5 +127,5 @@ class SessionStatus(BaseStatus):
     query = "SHOW SESSION STATUS"
 
 
-global_status = SimpleLazyObject(GlobalStatus)
-session_status = SimpleLazyObject(SessionStatus)
+global_status = GlobalStatus()
+session_status = SessionStatus()