From 494bdf121f32083f748dd03950d2ff13060b4fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Thu, 19 Jun 2025 15:15:52 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=85=20Set=20clear=5Fsqlmodel=20to=20a?= =?UTF-8?q?utouse=3DTrue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index a95eb3279f..9e8a45cc2c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,8 +14,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 From 8136966fe20a85e9b0597e68e4c2038e1e774ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Thu, 19 Jun 2025 15:18:09 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=85=20Use=20new=20clear=5Fsqlmodel=20?= =?UTF-8?q?autouse?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_advanced/test_decimal/test_tutorial001.py | 2 +- tests/test_advanced/test_decimal/test_tutorial001_py310.py | 2 +- tests/test_advanced/test_uuid/test_tutorial001.py | 2 +- tests/test_advanced/test_uuid/test_tutorial001_py310.py | 2 +- tests/test_advanced/test_uuid/test_tutorial002.py | 2 +- tests/test_advanced/test_uuid/test_tutorial002_py310.py | 2 +- .../test_tutorial001_tutorial002.py | 4 ++-- tests/test_tutorial/test_code_structure/test_tutorial001.py | 2 +- .../test_code_structure/test_tutorial001_py310.py | 2 +- .../test_code_structure/test_tutorial001_py39.py | 2 +- tests/test_tutorial/test_code_structure/test_tutorial002.py | 2 +- .../test_code_structure/test_tutorial002_py310.py | 2 +- .../test_code_structure/test_tutorial002_py39.py | 2 +- .../test_create_connected_tables/test_tutorial001.py | 2 +- .../test_create_connected_tables/test_tutorial001_py310.py | 2 +- .../test_connect/test_delete/test_tutorial001.py | 2 +- .../test_connect/test_delete/test_tutorial001_py310.py | 2 +- .../test_connect/test_insert/test_tutorial001.py | 2 +- .../test_connect/test_insert/test_tutorial001_py310.py | 2 +- .../test_select/test_tutorial001_py310_tutorial002_py310.py | 4 ++-- .../test_connect/test_select/test_tutorial001_tutorial002.py | 4 ++-- .../test_connect/test_select/test_tutorial003.py | 2 +- .../test_connect/test_select/test_tutorial003_py310.py | 2 +- .../test_connect/test_select/test_tutorial004.py | 2 +- .../test_connect/test_select/test_tutorial004_py310.py | 2 +- .../test_connect/test_select/test_tutorial005.py | 2 +- .../test_connect/test_select/test_tutorial005_py310.py | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/test_advanced/test_decimal/test_tutorial001.py b/tests/test_advanced/test_decimal/test_tutorial001.py index 1dafdfb322..2dc562209f 100644 --- a/tests/test_advanced/test_decimal/test_tutorial001.py +++ b/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://" diff --git a/tests/test_advanced/test_decimal/test_tutorial001_py310.py b/tests/test_advanced/test_decimal/test_tutorial001_py310.py index f58ea11a7c..4cda8b4653 100644 --- a/tests/test_advanced/test_decimal/test_tutorial001_py310.py +++ b/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://" diff --git a/tests/test_advanced/test_uuid/test_tutorial001.py b/tests/test_advanced/test_uuid/test_tutorial001.py index 405195f8e9..b9d5a36800 100644 --- a/tests/test_advanced/test_uuid/test_tutorial001.py +++ b/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://" diff --git a/tests/test_advanced/test_uuid/test_tutorial001_py310.py b/tests/test_advanced/test_uuid/test_tutorial001_py310.py index ee8cb085df..1250c32872 100644 --- a/tests/test_advanced/test_uuid/test_tutorial001_py310.py +++ b/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://" diff --git a/tests/test_advanced/test_uuid/test_tutorial002.py b/tests/test_advanced/test_uuid/test_tutorial002.py index cefd95ba49..c9f4e5a35d 100644 --- a/tests/test_advanced/test_uuid/test_tutorial002.py +++ b/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://" diff --git a/tests/test_advanced/test_uuid/test_tutorial002_py310.py b/tests/test_advanced/test_uuid/test_tutorial002_py310.py index 96f85c5333..ba472e30fd 100644 --- a/tests/test_advanced/test_uuid/test_tutorial002_py310.py +++ b/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://" diff --git a/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py b/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py index 399f431b49..5c2504710b 100644 --- a/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py +++ b/tests/test_tutorial/test_automatic_id_none_refresh/test_tutorial001_tutorial002.py @@ -133,7 +133,7 @@ def check_calls(calls: List[List[Union[str, Dict[str, Any]]]]): ] -def test_tutorial_001(clear_sqlmodel): +def test_tutorial_001(): from docs_src.tutorial.automatic_id_none_refresh import tutorial001 as mod mod.sqlite_url = "sqlite://" @@ -147,7 +147,7 @@ def test_tutorial_001(clear_sqlmodel): check_calls(calls) -def test_tutorial_002(clear_sqlmodel): +def test_tutorial_002(): from docs_src.tutorial.automatic_id_none_refresh import tutorial002 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001.py b/tests/test_tutorial/test_code_structure/test_tutorial001.py index c6e3158360..109c1ef5c6 100644 --- a/tests/test_tutorial/test_code_structure/test_tutorial001.py +++ b/tests/test_tutorial/test_code_structure/test_tutorial001.py @@ -22,7 +22,7 @@ ] -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.code_structure.tutorial001 import app, database database.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py b/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py index 44d9d920fa..126bef25e1 100644 --- a/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py +++ b/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py @@ -23,7 +23,7 @@ @needs_py310 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.code_structure.tutorial001_py310 import app, database database.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py b/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py index b17917cff2..02f692eac8 100644 --- a/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py +++ b/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py @@ -23,7 +23,7 @@ @needs_py39 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.code_structure.tutorial001_py39 import app, database database.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002.py b/tests/test_tutorial/test_code_structure/test_tutorial002.py index 8e7ac8f173..ccbb849097 100644 --- a/tests/test_tutorial/test_code_structure/test_tutorial002.py +++ b/tests/test_tutorial/test_code_structure/test_tutorial002.py @@ -22,7 +22,7 @@ ] -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.code_structure.tutorial002 import app, database database.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py b/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py index 3eafdee831..be28486652 100644 --- a/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py +++ b/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py @@ -23,7 +23,7 @@ @needs_py310 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.code_structure.tutorial002_py310 import app, database database.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py b/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py index 9b5eb670c2..55f6a435dc 100644 --- a/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py +++ b/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py @@ -23,7 +23,7 @@ @needs_py39 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.code_structure.tutorial002_py39 import app, database database.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py index e3e0799246..265a05931c 100644 --- a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py +++ b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001.py @@ -3,7 +3,7 @@ from sqlmodel import create_engine -def test_tutorial001(clear_sqlmodel): +def test_tutorial001(): from docs_src.tutorial.connect.create_tables import tutorial001 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py index ec2990ebfb..95f15a4266 100644 --- a/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py +++ b/tests/test_tutorial/test_connect/test_create_connected_tables/test_tutorial001_py310.py @@ -6,7 +6,7 @@ @needs_py310 -def test_tutorial001(clear_sqlmodel): +def test_tutorial001(): from docs_src.tutorial.connect.create_tables import tutorial001_py310 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py b/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py index a5db3867e4..1a9fe293ba 100644 --- a/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py +++ b/tests/test_tutorial/test_connect/test_delete/test_tutorial001.py @@ -58,7 +58,7 @@ ] -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.delete import tutorial001 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py b/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py index edc70b8a3d..f1bef3ed02 100644 --- a/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py +++ b/tests/test_tutorial/test_connect/test_delete/test_tutorial001_py310.py @@ -59,7 +59,7 @@ @needs_py310 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.delete import tutorial001_py310 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py b/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py index 8c8a303a21..cfc08ee854 100644 --- a/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py +++ b/tests/test_tutorial/test_connect/test_insert/test_tutorial001.py @@ -38,7 +38,7 @@ ] -def test_tutorial001(clear_sqlmodel): +def test_tutorial001(): from docs_src.tutorial.connect.insert import tutorial001 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py b/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py index 854c0068ab..6dabc10b80 100644 --- a/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py +++ b/tests/test_tutorial/test_connect/test_insert/test_tutorial001_py310.py @@ -39,7 +39,7 @@ @needs_py310 -def test_tutorial001(clear_sqlmodel): +def test_tutorial001(): from docs_src.tutorial.connect.insert import tutorial001_py310 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py index d3bab7f669..4809d79b68 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial001_py310_tutorial002_py310.py @@ -63,7 +63,7 @@ @needs_py310 -def test_tutorial001(clear_sqlmodel): +def test_tutorial001(): from docs_src.tutorial.connect.select import tutorial001_py310 as mod mod.sqlite_url = "sqlite://" @@ -78,7 +78,7 @@ def test_tutorial001(clear_sqlmodel): @needs_py310 -def test_tutorial002(clear_sqlmodel): +def test_tutorial002(): from docs_src.tutorial.connect.select import tutorial002_py310 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py b/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py index 541a8ee00f..c0d6b59dd9 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial001_tutorial002.py @@ -62,7 +62,7 @@ ] -def test_tutorial001(clear_sqlmodel): +def test_tutorial001(): from docs_src.tutorial.connect.select import tutorial001 as mod mod.sqlite_url = "sqlite://" @@ -76,7 +76,7 @@ def test_tutorial001(clear_sqlmodel): assert calls == expected_calls -def test_tutorial002(clear_sqlmodel): +def test_tutorial002(): from docs_src.tutorial.connect.select import tutorial002 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial003.py b/tests/test_tutorial/test_connect/test_select/test_tutorial003.py index 2eab135add..f309e1c44e 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial003.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial003.py @@ -74,7 +74,7 @@ ] -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.select import tutorial003 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py index 5b710c4358..e826ce44ae 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial003_py310.py @@ -75,7 +75,7 @@ @needs_py310 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.select import tutorial003_py310 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial004.py b/tests/test_tutorial/test_connect/test_select/test_tutorial004.py index ebc273feb1..a33c814856 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial004.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial004.py @@ -48,7 +48,7 @@ ] -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.select import tutorial004 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py index 72974ec6cf..33dd8a4329 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial004_py310.py @@ -49,7 +49,7 @@ @needs_py310 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.select import tutorial004_py310 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial005.py b/tests/test_tutorial/test_connect/test_select/test_tutorial005.py index 400c6483cb..f7ad78dc65 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial005.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial005.py @@ -50,7 +50,7 @@ ] -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.select import tutorial005 as mod mod.sqlite_url = "sqlite://" diff --git a/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py b/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py index a7332c18a7..8cddb6455a 100644 --- a/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py +++ b/tests/test_tutorial/test_connect/test_select/test_tutorial005_py310.py @@ -51,7 +51,7 @@ @needs_py310 -def test_tutorial(clear_sqlmodel): +def test_tutorial(): from docs_src.tutorial.connect.select import tutorial005_py310 as mod mod.sqlite_url = "sqlite://"