Merge branch 'main' into feat/py314

Author: svlandeg

docs/release-notes.md

@@ -12,6 +12,7 @@
 
 ### Internal
 
+* ⬆ Bump mypy from 1.4.1 to 1.18.2. PR [#1560](https://github.com/fastapi/sqlmodel/pull/1560) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ✅ Add test that runs select with 3 or 4 arguments. PR [#1590](https://github.com/fastapi/sqlmodel/pull/1590) by [@svlandeg](https://github.com/svlandeg).
 * ⬆ Bump mkdocs-macros-plugin from 1.3.9 to 1.4.0. PR [#1581](https://github.com/fastapi/sqlmodel/pull/1581) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ⬆ Bump mkdocs-material from 9.6.20 to 9.6.21. PR [#1588](https://github.com/fastapi/sqlmodel/pull/1588) by [@dependabot[bot]](https://github.com/apps/dependabot).

pyproject.toml

@@ -99,10 +99,7 @@ show_contexts = true
 
 [tool.mypy]
 strict = true
-
-[[tool.mypy.overrides]]
-module = "sqlmodel.sql._expression_select_gen"
-warn_unused_ignores = false
+exclude = "sqlmodel.sql._expression_select_gen"
 
 [[tool.mypy.overrides]]
 module = "docs_src.*"

requirements-tests.txt

@@ -2,7 +2,9 @@
 -r requirements-docs-tests.txt
 pytest >=7.0.1,<9.0.0
 coverage[toml] >=6.2,<8.0
-mypy ==1.4.1
+# Remove when support for Python 3.8 is dropped
+mypy ==1.14.1; python_version < "3.9"
+mypy ==1.18.2; python_version >= "3.9"
 ruff ==0.13.2
 # For FastAPI tests
 fastapi >=0.103.2

sqlmodel/_compat.py

@@ -123,7 +123,7 @@ def init_pydantic_private_attrs(new_object: InstanceOrType["SQLModel"]) -> None:
         object.__setattr__(new_object, "__pydantic_private__", None)
 
     def get_annotations(class_dict: Dict[str, Any]) -> Dict[str, Any]:
-        return class_dict.get("__annotations__", {})
+        return class_dict.get("__annotations__", {})  # type: ignore[no-any-return]
 
     def is_table_model_class(cls: Type[Any]) -> bool:
         config = getattr(cls, "model_config", {})
@@ -180,7 +180,7 @@ def is_field_noneable(field: "FieldInfo") -> bool:
         if not field.is_required():
             if field.default is Undefined:
                 return False
-            if field.annotation is None or field.annotation is NoneType:  # type: ignore[comparison-overlap]
+            if field.annotation is None or field.annotation is NoneType:
                 return True
             return False
         return False
@@ -509,7 +509,7 @@ def _calculate_keys(
             keys -= update.keys()
 
         if exclude:
-            keys -= {k for k, v in exclude.items() if ValueItems.is_true(v)}
+            keys -= {str(k) for k, v in exclude.items() if ValueItems.is_true(v)}
 
         return keys
 

sqlmodel/main.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import ipaddress
 import uuid
 import weakref
@@ -601,7 +603,7 @@ def __init__(
                     setattr(cls, rel_name, rel_info.sa_relationship)  # Fix #315
                     continue
                 raw_ann = cls.__annotations__[rel_name]
-                origin = get_origin(raw_ann)
+                origin: Any = get_origin(raw_ann)
                 if origin is Mapped:
                     ann = raw_ann.__args__[0]
                 else: