✅ Require Python 3.9 and 3.10 for tests

fastapi · Nov 29, 2023 · c6cedb3 · c6cedb3
1 parent 9f5d5ea
commit c6cedb3
Show file tree

Hide file tree

Showing 94 changed files with 230 additions and 62 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,6 @@
 import shutil
 import subprocess
+import sys
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Union
 
@@ -67,3 +68,9 @@ def new_print(*args):
         calls.append(data)
 
     return new_print
+
+
+needs_py39 = pytest.mark.skipif(sys.version_info < (3, 9), reason="requires python3.9+")
+needs_py310 = pytest.mark.skipif(
+    sys.version_info < (3, 10), reason="requires python3.10+"
+)
diff --git a/tests/test_advanced/test_decimal/test_tutorial001_py310.py b/tests/test_advanced/test_decimal/test_tutorial001_py310.py
@@ -3,7 +3,7 @@
 
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -30,6 +30,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.advanced.decimal import tutorial001_py310 as mod
 

diff --git a/.../test_tutorial/test_automatic_id_none_refresh/test_tutorial001_py310_tutorial002_py310.py b/.../test_tutorial/test_automatic_id_none_refresh/test_tutorial001_py310_tutorial002_py310.py
@@ -3,7 +3,7 @@
 
 from sqlmodel import create_engine
 
-from tests.conftest import get_testing_print_function
+from tests.conftest import get_testing_print_function, needs_py310
 
 
 def check_calls(calls: List[List[Union[str, Dict[str, Any]]]]):
@@ -133,6 +133,7 @@ def check_calls(calls: List[List[Union[str, Dict[str, Any]]]]):
     ]
 
 
+@needs_py310
 def test_tutorial_001(clear_sqlmodel):
     from docs_src.tutorial.automatic_id_none_refresh import tutorial001_py310 as mod
 
@@ -147,6 +148,7 @@ def test_tutorial_001(clear_sqlmodel):
     check_calls(calls)
 
 
+@needs_py310
 def test_tutorial_002(clear_sqlmodel):
     from docs_src.tutorial.automatic_id_none_refresh import tutorial002_py310 as mod
 

diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py b/tests/test_tutorial/test_code_structure/test_tutorial001_py310.py
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -22,6 +22,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.code_structure.tutorial001_py310 import app, database
 

diff --git a/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py b/tests/test_tutorial/test_code_structure/test_tutorial001_py39.py
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import get_testing_print_function, needs_py39
 
 expected_calls = [
     [
@@ -22,6 +22,7 @@
 ]
 
 
+@needs_py39
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.code_structure.tutorial001_py39 import app, database
 

diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py b/tests/test_tutorial/test_code_structure/test_tutorial002_py310.py
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -22,6 +22,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.code_structure.tutorial002_py310 import app, database
 

diff --git a/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py b/tests/test_tutorial/test_code_structure/test_tutorial002_py39.py
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import get_testing_print_function, needs_py39
 
 expected_calls = [
     [
@@ -22,6 +22,7 @@
 ]
 
 
+@needs_py39
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.code_structure.tutorial002_py39 import app, database
 

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
@@ -2,7 +2,10 @@
 from sqlalchemy.engine.reflection import Inspector
 from sqlmodel import create_engine
 
+from ....conftest import needs_py310
 
+
+@needs_py310
 def test_tutorial001(clear_sqlmodel):
     from docs_src.tutorial.connect.create_tables import tutorial001_py310 as mod
 

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
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ....conftest import get_testing_print_function
+from ....conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -58,6 +58,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.connect.delete import tutorial001_py310 as mod
 

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
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ....conftest import get_testing_print_function
+from ....conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -38,6 +38,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial001(clear_sqlmodel):
     from docs_src.tutorial.connect.insert import tutorial001_py310 as mod
 

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
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ....conftest import get_testing_print_function
+from ....conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -62,6 +62,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial001(clear_sqlmodel):
     from docs_src.tutorial.connect.select import tutorial001_py310 as mod
 
@@ -76,6 +77,7 @@ def test_tutorial001(clear_sqlmodel):
     assert calls == expected_calls
 
 
+@needs_py310
 def test_tutorial002(clear_sqlmodel):
     from docs_src.tutorial.connect.select import tutorial002_py310 as mod
 

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
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ....conftest import get_testing_print_function
+from ....conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -74,6 +74,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.connect.select import tutorial003_py310 as mod
 

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
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ....conftest import get_testing_print_function
+from ....conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -48,6 +48,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.connect.select import tutorial004_py310 as mod
 

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
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ....conftest import get_testing_print_function
+from ....conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -50,6 +50,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.connect.select import tutorial005_py310 as mod
 

diff --git a/tests/test_tutorial/test_connect/test_update/test_tutorial001_py310.py b/tests/test_tutorial/test_connect/test_update/test_tutorial001_py310.py
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ....conftest import get_testing_print_function
+from ....conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -48,6 +48,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.connect.update import tutorial001_py310 as mod
 

diff --git a/tests/test_tutorial/test_create_db_and_table/test_tutorial001_py310.py b/tests/test_tutorial/test_create_db_and_table/test_tutorial001_py310.py
@@ -1,8 +1,9 @@
 from pathlib import Path
 
-from ...conftest import coverage_run
+from ...conftest import coverage_run, needs_py310
 
 
+@needs_py310
 def test_create_db_and_table(cov_tmp_path: Path):
     module = "docs_src.tutorial.create_db_and_table.tutorial001_py310"
     result = coverage_run(module=module, cwd=cov_tmp_path)

diff --git a/tests/test_tutorial/test_create_db_and_table/test_tutorial002_py310.py b/tests/test_tutorial/test_create_db_and_table/test_tutorial002_py310.py
@@ -2,7 +2,10 @@
 from sqlalchemy.engine.reflection import Inspector
 from sqlmodel import create_engine
 
+from ...conftest import needs_py310
 
+
+@needs_py310
 def test_create_db_and_table(clear_sqlmodel):
     from docs_src.tutorial.create_db_and_table import tutorial002_py310 as mod
 

diff --git a/tests/test_tutorial/test_create_db_and_table/test_tutorial003_py310.py b/tests/test_tutorial/test_create_db_and_table/test_tutorial003_py310.py
@@ -2,7 +2,10 @@
 from sqlalchemy.engine.reflection import Inspector
 from sqlmodel import create_engine
 
+from ...conftest import needs_py310
 
+
+@needs_py310
 def test_create_db_and_table(clear_sqlmodel):
     from docs_src.tutorial.create_db_and_table import tutorial003_py310 as mod
 

diff --git a/tests/test_tutorial/test_delete/test_tutorial001_py310_tutorial002_py310.py b/tests/test_tutorial/test_delete/test_tutorial001_py310_tutorial002_py310.py
@@ -2,7 +2,7 @@
 
 from sqlmodel import create_engine
 
-from ...conftest import get_testing_print_function
+from ...conftest import get_testing_print_function, needs_py310
 
 expected_calls = [
     [
@@ -58,6 +58,7 @@
 ]
 
 
+@needs_py310
 def test_tutorial001(clear_sqlmodel):
     from docs_src.tutorial.delete import tutorial001_py310 as mod
 

diff --git a/tests/test_tutorial/test_fastapi/test_app_testing/test_tutorial001_py310_tests_main.py b/tests/test_tutorial/test_fastapi/test_app_testing/test_tutorial001_py310_tests_main.py
@@ -1,7 +1,10 @@
 import subprocess
 from pathlib import Path
 
+from ....conftest import needs_py310
 
+
+@needs_py310
 def test_run_tests(clear_sqlmodel):
     from docs_src.tutorial.fastapi.app_testing.tutorial001_py310 import test_main as mod
 

diff --git a/tests/test_tutorial/test_fastapi/test_app_testing/test_tutorial001_py39_tests_main.py b/tests/test_tutorial/test_fastapi/test_app_testing/test_tutorial001_py39_tests_main.py
@@ -1,7 +1,10 @@
 import subprocess
 from pathlib import Path
 
+from ....conftest import needs_py39
 
+
+@needs_py39
 def test_run_tests(clear_sqlmodel):
     from docs_src.tutorial.fastapi.app_testing.tutorial001_py39 import test_main as mod
 

diff --git a/tests/test_tutorial/test_fastapi/test_delete/test_tutorial001_py310.py b/tests/test_tutorial/test_fastapi/test_delete/test_tutorial001_py310.py
@@ -2,7 +2,10 @@
 from sqlmodel import create_engine
 from sqlmodel.pool import StaticPool
 
+from ....conftest import needs_py310
 
+
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.fastapi.delete import tutorial001_py310 as mod
 

diff --git a/tests/test_tutorial/test_fastapi/test_delete/test_tutorial001_py39.py b/tests/test_tutorial/test_fastapi/test_delete/test_tutorial001_py39.py
@@ -2,7 +2,10 @@
 from sqlmodel import create_engine
 from sqlmodel.pool import StaticPool
 
+from ....conftest import needs_py39
 
+
+@needs_py39
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.fastapi.delete import tutorial001_py39 as mod
 

diff --git a/tests/test_tutorial/test_fastapi/test_limit_and_offset/test_tutorial001_py310.py b/tests/test_tutorial/test_fastapi/test_limit_and_offset/test_tutorial001_py310.py
@@ -2,7 +2,10 @@
 from sqlmodel import create_engine
 from sqlmodel.pool import StaticPool
 
+from ....conftest import needs_py310
 
+
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.fastapi.limit_and_offset import tutorial001_py310 as mod
 

diff --git a/tests/test_tutorial/test_fastapi/test_limit_and_offset/test_tutorial001_py39.py b/tests/test_tutorial/test_fastapi/test_limit_and_offset/test_tutorial001_py39.py
@@ -2,7 +2,10 @@
 from sqlmodel import create_engine
 from sqlmodel.pool import StaticPool
 
+from ....conftest import needs_py39
 
+
+@needs_py39
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.fastapi.limit_and_offset import tutorial001_py39 as mod
 

diff --git a/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001_py310.py b/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001_py310.py
@@ -4,7 +4,10 @@
 from sqlmodel import create_engine
 from sqlmodel.pool import StaticPool
 
+from ....conftest import needs_py310
 
+
+@needs_py310
 def test_tutorial(clear_sqlmodel):
     from docs_src.tutorial.fastapi.multiple_models import tutorial001_py310 as mod