Merge branch 'main' into ami/pydantic-jsonb

Author: amanmibra

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.12.0
     hooks:
     -   id: ruff
         args:

docs/release-notes.md

@@ -19,6 +19,15 @@
 
 ### Internal
 
+* ⬆ [pre-commit.ci] pre-commit autoupdate. PR [#1374](https://github.com/fastapi/sqlmodel/pull/1374) by [@pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci).
+* ⬆ Bump ruff from 0.11.13 to 0.12.0. PR [#1403](https://github.com/fastapi/sqlmodel/pull/1403) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ✅ Simplify tests for `tests/test_tutorial/test_code_structure/test_tutorial001.py`, one test file for multiple variants. PR [#1408](https://github.com/fastapi/sqlmodel/pull/1408) by [@tiangolo](https://github.com/tiangolo).
+* ✅ Simplify tests setup, one test file for multiple source variants. PR [#1407](https://github.com/fastapi/sqlmodel/pull/1407) by [@tiangolo](https://github.com/tiangolo).
+* ✅ Refactor tests to use autouse `clear_sqlmodel`. PR [#1406](https://github.com/fastapi/sqlmodel/pull/1406) by [@tiangolo](https://github.com/tiangolo).
+* ⬆ Bump mkdocs-material from 9.5.18 to 9.6.14. PR [#1378](https://github.com/fastapi/sqlmodel/pull/1378) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump typer from 0.15.3 to 0.16.0. PR [#1393](https://github.com/fastapi/sqlmodel/pull/1393) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump cairosvg from 2.7.1 to 2.8.2. PR [#1383](https://github.com/fastapi/sqlmodel/pull/1383) by [@dependabot[bot]](https://github.com/apps/dependabot).
+* ⬆ Bump ruff from 0.11.7 to 0.11.13. PR [#1397](https://github.com/fastapi/sqlmodel/pull/1397) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * 🔧 Remove Google Analytics. PR [#1386](https://github.com/fastapi/sqlmodel/pull/1386) by [@tiangolo](https://github.com/tiangolo).
 * ⬆ Bump mkdocs-macros-plugin from 1.0.5 to 1.3.7. PR [#1354](https://github.com/fastapi/sqlmodel/pull/1354) by [@dependabot[bot]](https://github.com/apps/dependabot).
 * ⬆ Bump griffe-typingdoc from 0.2.5 to 0.2.8. PR [#1359](https://github.com/fastapi/sqlmodel/pull/1359) by [@dependabot[bot]](https://github.com/apps/dependabot).

requirements-docs.txt

@@ -1,6 +1,6 @@
 -e .
 -r requirements-docs-tests.txt
-mkdocs-material==9.5.18
+mkdocs-material==9.6.14
 mdx-include >=1.4.1,<2.0.0
 mkdocs-redirects>=1.2.1,<1.3.0
 pyyaml >=5.3.1,<7.0.0
@@ -9,10 +9,10 @@ pyyaml >=5.3.1,<7.0.0
 # For image processing by Material for MkDocs
 pillow==11.2.1
 # For image processing by Material for MkDocs
-cairosvg==2.7.1
+cairosvg==2.8.2
 # mkdocstrings[python]==0.25.1
 griffe-typingdoc==0.2.8
 # For griffe, it formats with black
-typer == 0.15.3
+typer == 0.16.0
 mkdocs-macros-plugin==1.3.7
 markdown-include-variants==0.0.4

requirements-tests.txt

@@ -3,7 +3,7 @@
 pytest >=7.0.1,<9.0.0
 coverage[toml] >=6.2,<8.0
 mypy ==1.4.1
-ruff ==0.11.7
+ruff ==0.12.0
 # For FastAPI tests
 fastapi >=0.103.2
 httpx ==0.28.1

tests/conftest.py

@@ -1,8 +1,10 @@
 import shutil
 import subprocess
 import sys
+from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Union
+from typing import Any, Callable, Dict, Generator, List, Union
+from unittest.mock import patch
 
 import pytest
 from pydantic import BaseModel
@@ -14,8 +16,8 @@
 docs_src_path = top_level_path / "docs_src"
 
 
-@pytest.fixture()
-def clear_sqlmodel():
+@pytest.fixture(autouse=True)
+def clear_sqlmodel() -> Any:
     # Clear the tables in the metadata for the default base model
     SQLModel.metadata.clear()
     # Clear the Models associated with the registry, to avoid warnings
@@ -26,7 +28,7 @@ def clear_sqlmodel():
 
 
 @pytest.fixture()
-def cov_tmp_path(tmp_path: Path):
+def cov_tmp_path(tmp_path: Path) -> Generator[Path, None, None]:
     yield tmp_path
     for coverage_path in tmp_path.glob(".coverage*"):
         coverage_destiny_path = top_level_path / coverage_path.name
@@ -53,8 +55,8 @@ def coverage_run(*, module: str, cwd: Union[str, Path]) -> subprocess.CompletedP
 def get_testing_print_function(
     calls: List[List[Union[str, Dict[str, Any]]]],
 ) -> Callable[..., Any]:
-    def new_print(*args):
-        data = []
+    def new_print(*args: Any) -> None:
+        data: List[Any] = []
         for arg in args:
             if isinstance(arg, BaseModel):
                 data.append(arg.model_dump())
@@ -71,6 +73,19 @@ def new_print(*args):
     return new_print
 
 
+@dataclass
+class PrintMock:
+    calls: List[Any] = field(default_factory=list)
+
+
+@pytest.fixture(name="print_mock")
+def print_mock_fixture() -> Generator[PrintMock, None, None]:
+    print_mock = PrintMock()
+    new_print = get_testing_print_function(print_mock.calls)
+    with patch("builtins.print", new=new_print):
+        yield print_mock
+
+
 needs_pydanticv2 = pytest.mark.skipif(not IS_PYDANTIC_V2, reason="requires Pydantic v2")
 needs_pydanticv1 = pytest.mark.skipif(IS_PYDANTIC_V2, reason="requires Pydantic v1")
 

tests/test_advanced/test_decimal/test_tutorial001.py

@@ -30,7 +30,7 @@
 ]
 
 
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.advanced.decimal import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"

tests/test_advanced/test_decimal/test_tutorial001_py310.py

@@ -31,7 +31,7 @@
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel):
+def test_tutorial():
     from docs_src.advanced.decimal import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"

tests/test_advanced/test_uuid/test_tutorial001.py

@@ -6,7 +6,7 @@
 from ...conftest import get_testing_print_function
 
 
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial001 as mod
 
     mod.sqlite_url = "sqlite://"

tests/test_advanced/test_uuid/test_tutorial001_py310.py

@@ -7,7 +7,7 @@
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial001_py310 as mod
 
     mod.sqlite_url = "sqlite://"

tests/test_advanced/test_uuid/test_tutorial002.py

@@ -6,7 +6,7 @@
 from ...conftest import get_testing_print_function
 
 
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial002 as mod
 
     mod.sqlite_url = "sqlite://"

tests/test_advanced/test_uuid/test_tutorial002_py310.py

@@ -7,7 +7,7 @@
 
 
 @needs_py310
-def test_tutorial(clear_sqlmodel) -> None:
+def test_tutorial() -> None:
     from docs_src.advanced.uuid import tutorial002_py310 as mod
 
     mod.sqlite_url = "sqlite://"