From bed4fc10f023aa98d3b503ab9bf62efa8624f01c Mon Sep 17 00:00:00 2001 From: Yurii Motov Date: Thu, 18 Dec 2025 13:48:51 +0100 Subject: [PATCH] Fix merge conflicts --- tests/test_tutorial/test_body/test_tutorial002.py | 2 +- tests/test_tutorial/test_body/test_tutorial003.py | 2 +- tests/test_tutorial/test_body/test_tutorial004.py | 2 +- .../test_body_multiple_params/test_tutorial002.py | 2 +- .../test_body_multiple_params/test_tutorial004.py | 7 +++---- .../test_body_multiple_params/test_tutorial005.py | 7 +++---- .../test_tutorial001_tutorial002_tutorial003.py | 10 ++++------ .../test_body_nested_models/test_tutorial004.py | 5 ++--- .../test_body_nested_models/test_tutorial005.py | 5 ++--- .../test_body_nested_models/test_tutorial006.py | 5 ++--- .../test_body_nested_models/test_tutorial007.py | 5 ++--- .../test_body_nested_models/test_tutorial008.py | 5 ++--- .../test_body_updates/test_tutorial002.py | 5 ++--- .../test_tutorial/test_debugging/test_tutorial001.py | 2 +- .../test_dependencies/test_tutorial005.py | 7 +++---- .../test_dependencies/test_tutorial011.py | 7 +++---- tests/test_tutorial/test_encoder/test_tutorial001.py | 2 +- .../test_tutorial001_tutorial002.py | 4 ++-- .../test_generate_clients/test_tutorial001.py | 5 +---- .../test_generate_clients/test_tutorial002.py | 2 +- .../test_generate_clients/test_tutorial004.py | 2 +- tests/test_tutorial/test_graphql/test_tutorial001.py | 2 +- .../test_tutorial/test_metadata/test_tutorial002.py | 2 +- .../test_tutorial/test_metadata/test_tutorial003.py | 2 +- .../test_middleware/test_tutorial001.py | 2 +- .../test_tutorial001.py | 5 ++--- .../test_tutorial002.py | 5 ++--- .../test_tutorial003_tutorial004.py | 8 +++----- .../test_path_params/test_tutorial001.py | 2 +- .../test_path_params/test_tutorial002.py | 2 +- .../test_path_params/test_tutorial003.py | 2 +- .../test_path_params/test_tutorial003b.py | 2 +- .../test_tutorial001.py | 7 +++---- .../test_tutorial002_tutorial003.py | 12 +++++------- .../test_tutorial004.py | 7 +++---- .../test_tutorial005.py | 7 +++---- .../test_tutorial006.py | 7 +++---- .../test_query_params/test_tutorial001.py | 2 +- .../test_query_params/test_tutorial002.py | 2 +- .../test_query_params/test_tutorial003.py | 2 +- .../test_query_params/test_tutorial004.py | 2 +- .../test_tutorial001.py | 2 +- .../test_tutorial002.py | 4 ++-- .../test_tutorial003.py | 7 +++---- .../test_tutorial004.py | 7 +++---- .../test_tutorial005.py | 7 +++---- .../test_tutorial006.py | 3 +-- .../test_tutorial007.py | 7 +++---- .../test_tutorial008.py | 7 +++---- .../test_tutorial009.py | 7 +++---- .../test_response_directly/test_tutorial002.py | 2 +- .../test_tutorial001_tutorial001_01.py | 8 +++----- .../test_response_model/test_tutorial002.py | 2 +- .../test_tutorial001_tutorial002.py | 4 ++-- .../test_schema_extra_example/test_tutorial002.py | 2 +- .../test_schema_extra_example/test_tutorial003.py | 7 +++---- .../test_tutorial/test_security/test_tutorial002.py | 7 +++---- .../test_tutorial/test_security/test_tutorial004.py | 7 +++---- tests/test_tutorial/test_settings/test_app01.py | 2 +- .../test_static_files/test_tutorial001.py | 2 +- 60 files changed, 116 insertions(+), 153 deletions(-) diff --git a/tests/test_tutorial/test_body/test_tutorial002.py b/tests/test_tutorial/test_body/test_tutorial002.py index 69fa92d5c..8a1a4af16 100644 --- a/tests/test_tutorial/test_body/test_tutorial002.py +++ b/tests/test_tutorial/test_body/test_tutorial002.py @@ -17,7 +17,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial002", + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body/test_tutorial003.py b/tests/test_tutorial/test_body/test_tutorial003.py index f994adb29..0968f2de3 100644 --- a/tests/test_tutorial/test_body/test_tutorial003.py +++ b/tests/test_tutorial/test_body/test_tutorial003.py @@ -16,7 +16,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial003", + pytest.param("tutorial003_py39"), pytest.param("tutorial003_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body/test_tutorial004.py b/tests/test_tutorial/test_body/test_tutorial004.py index 55a79c72e..e997f11cf 100644 --- a/tests/test_tutorial/test_body/test_tutorial004.py +++ b/tests/test_tutorial/test_body/test_tutorial004.py @@ -16,7 +16,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial004", + pytest.param("tutorial004_py39"), pytest.param("tutorial004_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_multiple_params/test_tutorial002.py b/tests/test_tutorial/test_body_multiple_params/test_tutorial002.py index 8fae9d5f2..6146dec86 100644 --- a/tests/test_tutorial/test_body_multiple_params/test_tutorial002.py +++ b/tests/test_tutorial/test_body_multiple_params/test_tutorial002.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_multiple_params/test_tutorial004.py b/tests/test_tutorial/test_body_multiple_params/test_tutorial004.py index 1353ead82..ea05b133b 100644 --- a/tests/test_tutorial/test_body_multiple_params/test_tutorial004.py +++ b/tests/test_tutorial/test_body_multiple_params/test_tutorial004.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial004"), + pytest.param("tutorial004_py39"), pytest.param("tutorial004_py310", marks=needs_py310), - "tutorial004_an", - pytest.param("tutorial004_an_py39", marks=needs_py39), + pytest.param("tutorial004_an_py39"), pytest.param("tutorial004_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_multiple_params/test_tutorial005.py b/tests/test_tutorial/test_body_multiple_params/test_tutorial005.py index 99c39445e..19bfa2e81 100644 --- a/tests/test_tutorial/test_body_multiple_params/test_tutorial005.py +++ b/tests/test_tutorial/test_body_multiple_params/test_tutorial005.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial005"), + pytest.param("tutorial005_py39"), pytest.param("tutorial005_py310", marks=needs_py310), - "tutorial005_an", - pytest.param("tutorial005_an_py39", marks=needs_py39), + pytest.param("tutorial005_an_py39"), pytest.param("tutorial005_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_nested_models/test_tutorial001_tutorial002_tutorial003.py b/tests/test_tutorial/test_body_nested_models/test_tutorial001_tutorial002_tutorial003.py index e2ec2ee00..07bf83d0c 100644 --- a/tests/test_tutorial/test_body_nested_models/test_tutorial001_tutorial002_tutorial003.py +++ b/tests/test_tutorial/test_body_nested_models/test_tutorial001_tutorial002_tutorial003.py @@ -4,7 +4,7 @@ import pytest from dirty_equals import IsList from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -18,13 +18,11 @@ SET_OF_STR_SCHEMA = {"type": "array", "items": {"type": "string"}, "uniqueItems" @pytest.fixture( name="mod_name", params=[ - pytest.param("tutorial001"), + pytest.param("tutorial001_py39"), pytest.param("tutorial001_py310", marks=needs_py310), - pytest.param("tutorial002"), - pytest.param("tutorial002_py39", marks=needs_py39), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), - pytest.param("tutorial003"), - pytest.param("tutorial003_py39", marks=needs_py39), + pytest.param("tutorial003_py39"), pytest.param("tutorial003_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_nested_models/test_tutorial004.py b/tests/test_tutorial/test_body_nested_models/test_tutorial004.py index 26e7f9556..036c1879a 100644 --- a/tests/test_tutorial/test_body_nested_models/test_tutorial004.py +++ b/tests/test_tutorial/test_body_nested_models/test_tutorial004.py @@ -4,7 +4,7 @@ import pytest from dirty_equals import IsList from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -12,8 +12,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial004"), - pytest.param("tutorial004_py39", marks=needs_py39), + pytest.param("tutorial004_py39"), pytest.param("tutorial004_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_nested_models/test_tutorial005.py b/tests/test_tutorial/test_body_nested_models/test_tutorial005.py index 708c89908..39a94079d 100644 --- a/tests/test_tutorial/test_body_nested_models/test_tutorial005.py +++ b/tests/test_tutorial/test_body_nested_models/test_tutorial005.py @@ -4,7 +4,7 @@ import pytest from dirty_equals import IsList from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -12,8 +12,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial005"), - pytest.param("tutorial005_py39", marks=needs_py39), + pytest.param("tutorial005_py39"), pytest.param("tutorial005_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_nested_models/test_tutorial006.py b/tests/test_tutorial/test_body_nested_models/test_tutorial006.py index 5e0a58e95..8c8422f6b 100644 --- a/tests/test_tutorial/test_body_nested_models/test_tutorial006.py +++ b/tests/test_tutorial/test_body_nested_models/test_tutorial006.py @@ -4,7 +4,7 @@ import pytest from dirty_equals import IsList from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -12,8 +12,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial006"), - pytest.param("tutorial006_py39", marks=needs_py39), + pytest.param("tutorial006_py39"), pytest.param("tutorial006_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_nested_models/test_tutorial007.py b/tests/test_tutorial/test_body_nested_models/test_tutorial007.py index 3970acb35..97807aa00 100644 --- a/tests/test_tutorial/test_body_nested_models/test_tutorial007.py +++ b/tests/test_tutorial/test_body_nested_models/test_tutorial007.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,8 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial007"), - pytest.param("tutorial007_py39", marks=needs_py39), + pytest.param("tutorial007_py39"), pytest.param("tutorial007_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_body_nested_models/test_tutorial008.py b/tests/test_tutorial/test_body_nested_models/test_tutorial008.py index 4aca653bd..2d068c302 100644 --- a/tests/test_tutorial/test_body_nested_models/test_tutorial008.py +++ b/tests/test_tutorial/test_body_nested_models/test_tutorial008.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_pydanticv2 +from ...utils import needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,8 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial008", - pytest.param("tutorial008_py39", marks=needs_py39), + pytest.param("tutorial008_py39"), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_body_updates/test_tutorial002.py b/tests/test_tutorial/test_body_updates/test_tutorial002.py index e5e5e2e9b..609a10288 100644 --- a/tests/test_tutorial/test_body_updates/test_tutorial002.py +++ b/tests/test_tutorial/test_body_updates/test_tutorial002.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -17,9 +17,8 @@ pytestmark = pytest.mark.filterwarnings( @pytest.fixture( name="client", params=[ - "tutorial002", + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), - pytest.param("tutorial002_py39", marks=needs_py39), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_debugging/test_tutorial001.py b/tests/test_tutorial/test_debugging/test_tutorial001.py index 2a2afca12..5cfb78fce 100644 --- a/tests/test_tutorial/test_debugging/test_tutorial001.py +++ b/tests/test_tutorial/test_debugging/test_tutorial001.py @@ -5,7 +5,7 @@ import unittest import pytest from fastapi.testclient import TestClient -MOD_NAME = "docs_src.debugging.tutorial001" +MOD_NAME = "docs_src.debugging.tutorial001_py39" @pytest.fixture(name="client") diff --git a/tests/test_tutorial/test_dependencies/test_tutorial005.py b/tests/test_tutorial/test_dependencies/test_tutorial005.py index 451dd1b7c..1aeab44e6 100644 --- a/tests/test_tutorial/test_dependencies/test_tutorial005.py +++ b/tests/test_tutorial/test_dependencies/test_tutorial005.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial005", + pytest.param("tutorial005_py39"), pytest.param("tutorial005_py310", marks=needs_py310), - "tutorial005_an", - pytest.param("tutorial005_an_py39", marks=needs_py39), + pytest.param("tutorial005_an_py39"), pytest.param("tutorial005_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_dependencies/test_tutorial011.py b/tests/test_tutorial/test_dependencies/test_tutorial011.py index 982235403..03bf86ace 100644 --- a/tests/test_tutorial/test_dependencies/test_tutorial011.py +++ b/tests/test_tutorial/test_dependencies/test_tutorial011.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_pydanticv2 +from ...utils import needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,9 +11,8 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial011", - "tutorial011_an", - pytest.param("tutorial011_an_py39", marks=needs_py39), + "tutorial011_py39", + pytest.param("tutorial011_an_py39"), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_encoder/test_tutorial001.py b/tests/test_tutorial/test_encoder/test_tutorial001.py index 9dda62d2a..27be0c32a 100644 --- a/tests/test_tutorial/test_encoder/test_tutorial001.py +++ b/tests/test_tutorial/test_encoder/test_tutorial001.py @@ -12,7 +12,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="mod", params=[ - pytest.param("tutorial001"), + pytest.param("tutorial001_py39"), pytest.param("tutorial001_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_extra_models/test_tutorial001_tutorial002.py b/tests/test_tutorial/test_extra_models/test_tutorial001_tutorial002.py index c89fc1a53..019bc5b8e 100644 --- a/tests/test_tutorial/test_extra_models/test_tutorial001_tutorial002.py +++ b/tests/test_tutorial/test_extra_models/test_tutorial001_tutorial002.py @@ -17,9 +17,9 @@ pytestmark = pytest.mark.filterwarnings( @pytest.fixture( name="client", params=[ - "tutorial001", + pytest.param("tutorial001_py39"), pytest.param("tutorial001_py310", marks=needs_py310), - "tutorial002", + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_generate_clients/test_tutorial001.py b/tests/test_tutorial/test_generate_clients/test_tutorial001.py index 168d582b7..bbb66b451 100644 --- a/tests/test_tutorial/test_generate_clients/test_tutorial001.py +++ b/tests/test_tutorial/test_generate_clients/test_tutorial001.py @@ -3,14 +3,11 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39 - @pytest.fixture( name="client", params=[ - "tutorial001", - pytest.param("tutorial001_py39", marks=needs_py39), + pytest.param("tutorial001_py39"), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_generate_clients/test_tutorial002.py b/tests/test_tutorial/test_generate_clients/test_tutorial002.py index fabc02f8f..ab8bc4c11 100644 --- a/tests/test_tutorial/test_generate_clients/test_tutorial002.py +++ b/tests/test_tutorial/test_generate_clients/test_tutorial002.py @@ -1,6 +1,6 @@ from fastapi.testclient import TestClient -from docs_src.generate_clients.tutorial002 import app +from docs_src.generate_clients.tutorial002_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_generate_clients/test_tutorial004.py b/tests/test_tutorial/test_generate_clients/test_tutorial004.py index 48a9b93e9..e66f6d2a1 100644 --- a/tests/test_tutorial/test_generate_clients/test_tutorial004.py +++ b/tests/test_tutorial/test_generate_clients/test_tutorial004.py @@ -12,7 +12,7 @@ def test_remove_tags(tmp_path: pathlib.Path): tmp_file.write_text(json.dumps(openapi_json)) with patch("pathlib.Path", return_value=tmp_file): - importlib.import_module("docs_src.generate_clients.tutorial004") + importlib.import_module("docs_src.generate_clients.tutorial004_py39") modified_openapi = json.loads(tmp_file.read_text()) assert modified_openapi == { diff --git a/tests/test_tutorial/test_graphql/test_tutorial001.py b/tests/test_tutorial/test_graphql/test_tutorial001.py index 4e2e69e8c..ca5973bb7 100644 --- a/tests/test_tutorial/test_graphql/test_tutorial001.py +++ b/tests/test_tutorial/test_graphql/test_tutorial001.py @@ -1,7 +1,7 @@ import pytest from starlette.testclient import TestClient -from docs_src.graphql.tutorial001 import app +from docs_src.graphql.tutorial001_py39 import app @pytest.fixture(name="client") diff --git a/tests/test_tutorial/test_metadata/test_tutorial002.py b/tests/test_tutorial/test_metadata/test_tutorial002.py index 62b953d1f..e2814c88f 100644 --- a/tests/test_tutorial/test_metadata/test_tutorial002.py +++ b/tests/test_tutorial/test_metadata/test_tutorial002.py @@ -1,6 +1,6 @@ from fastapi.testclient import TestClient -from docs_src.metadata.tutorial002 import app +from docs_src.metadata.tutorial002_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_metadata/test_tutorial003.py b/tests/test_tutorial/test_metadata/test_tutorial003.py index 97376c699..085c271cd 100644 --- a/tests/test_tutorial/test_metadata/test_tutorial003.py +++ b/tests/test_tutorial/test_metadata/test_tutorial003.py @@ -1,6 +1,6 @@ from fastapi.testclient import TestClient -from docs_src.metadata.tutorial003 import app +from docs_src.metadata.tutorial003_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_middleware/test_tutorial001.py b/tests/test_tutorial/test_middleware/test_tutorial001.py index c1864cc0c..cbcfd4146 100644 --- a/tests/test_tutorial/test_middleware/test_tutorial001.py +++ b/tests/test_tutorial/test_middleware/test_tutorial001.py @@ -1,6 +1,6 @@ from fastapi.testclient import TestClient -from docs_src.middleware.tutorial001 import app +from docs_src.middleware.tutorial001_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_path_operation_configurations/test_tutorial001.py b/tests/test_tutorial/test_path_operation_configurations/test_tutorial001.py index f7cdf341e..31d0a3d0e 100644 --- a/tests/test_tutorial/test_path_operation_configurations/test_tutorial001.py +++ b/tests/test_tutorial/test_path_operation_configurations/test_tutorial001.py @@ -4,7 +4,7 @@ import pytest from dirty_equals import IsList from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -12,8 +12,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial001"), - pytest.param("tutorial001_py39", marks=needs_py39), + pytest.param("tutorial001_py39"), pytest.param("tutorial001_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_path_operation_configurations/test_tutorial002.py b/tests/test_tutorial/test_path_operation_configurations/test_tutorial002.py index 89604f209..c16d8f655 100644 --- a/tests/test_tutorial/test_path_operation_configurations/test_tutorial002.py +++ b/tests/test_tutorial/test_path_operation_configurations/test_tutorial002.py @@ -4,7 +4,7 @@ import pytest from dirty_equals import IsList from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -12,8 +12,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), - pytest.param("tutorial002_py39", marks=needs_py39), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_path_operation_configurations/test_tutorial003_tutorial004.py b/tests/test_tutorial/test_path_operation_configurations/test_tutorial003_tutorial004.py index a07d3371a..91c225345 100644 --- a/tests/test_tutorial/test_path_operation_configurations/test_tutorial003_tutorial004.py +++ b/tests/test_tutorial/test_path_operation_configurations/test_tutorial003_tutorial004.py @@ -5,7 +5,7 @@ import pytest from dirty_equals import IsList from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -27,11 +27,9 @@ DESCRIPTIONS = { @pytest.fixture( name="mod_name", params=[ - pytest.param("tutorial003"), - pytest.param("tutorial003_py39", marks=needs_py39), + pytest.param("tutorial003_py39"), pytest.param("tutorial003_py310", marks=needs_py310), - pytest.param("tutorial004"), - pytest.param("tutorial004_py39", marks=needs_py39), + pytest.param("tutorial004_py39"), pytest.param("tutorial004_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_path_params/test_tutorial001.py b/tests/test_tutorial/test_path_params/test_tutorial001.py index 2446eb859..a898e386f 100644 --- a/tests/test_tutorial/test_path_params/test_tutorial001.py +++ b/tests/test_tutorial/test_path_params/test_tutorial001.py @@ -1,7 +1,7 @@ import pytest from fastapi.testclient import TestClient -from docs_src.path_params.tutorial001 import app +from docs_src.path_params.tutorial001_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_path_params/test_tutorial002.py b/tests/test_tutorial/test_path_params/test_tutorial002.py index 76dc15f4c..0bfc9f807 100644 --- a/tests/test_tutorial/test_path_params/test_tutorial002.py +++ b/tests/test_tutorial/test_path_params/test_tutorial002.py @@ -1,6 +1,6 @@ from fastapi.testclient import TestClient -from docs_src.path_params.tutorial002 import app +from docs_src.path_params.tutorial002_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_path_params/test_tutorial003.py b/tests/test_tutorial/test_path_params/test_tutorial003.py index 321beecd3..cd2c39ab0 100644 --- a/tests/test_tutorial/test_path_params/test_tutorial003.py +++ b/tests/test_tutorial/test_path_params/test_tutorial003.py @@ -1,7 +1,7 @@ import pytest from fastapi.testclient import TestClient -from docs_src.path_params.tutorial003 import app +from docs_src.path_params.tutorial003_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_path_params/test_tutorial003b.py b/tests/test_tutorial/test_path_params/test_tutorial003b.py index 57e6e4071..d08d92dd1 100644 --- a/tests/test_tutorial/test_path_params/test_tutorial003b.py +++ b/tests/test_tutorial/test_path_params/test_tutorial003b.py @@ -1,6 +1,6 @@ from fastapi.testclient import TestClient -from docs_src.path_params.tutorial003b import app +from docs_src.path_params.tutorial003b_py39 import app client = TestClient(app) diff --git a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial001.py b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial001.py index b3eaa7f60..cb1549026 100644 --- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial001.py +++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial001.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial001"), + pytest.param("tutorial001_py39"), pytest.param("tutorial001_py310", marks=needs_py310), - pytest.param("tutorial001_an"), - pytest.param("tutorial001_an_py39", marks=needs_py39), + pytest.param("tutorial001_an_py39"), pytest.param("tutorial001_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial002_tutorial003.py b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial002_tutorial003.py index 427ea3b25..33a516814 100644 --- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial002_tutorial003.py +++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial002_tutorial003.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_pydanticv2 +from ...utils import needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,12 +11,10 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), - pytest.param("tutorial002_an"), - pytest.param("tutorial002_an_py39", marks=needs_py39), - pytest.param("tutorial003"), - pytest.param("tutorial003_an"), - pytest.param("tutorial003_an_py39", marks=needs_py39), + pytest.param("tutorial002_py39"), + pytest.param("tutorial002_an_py39"), + pytest.param("tutorial003_py39"), + pytest.param("tutorial003_an_py39"), ], ) def get_client(request: pytest.FixtureRequest) -> TestClient: diff --git a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial004.py b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial004.py index ce2f8fe61..091157320 100644 --- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial004.py +++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial004.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_pydanticv2 +from ...utils import needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,9 +11,8 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial004"), - pytest.param("tutorial004_an"), - pytest.param("tutorial004_an_py39", marks=needs_py39), + pytest.param("tutorial004_py39"), + pytest.param("tutorial004_an_py39"), ], ) def get_client(request: pytest.FixtureRequest) -> TestClient: diff --git a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial005.py b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial005.py index 5ffe0c423..90657bb05 100644 --- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial005.py +++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial005.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_pydanticv2 +from ...utils import needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,9 +11,8 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial005"), - pytest.param("tutorial005_an"), - pytest.param("tutorial005_an_py39", marks=needs_py39), + pytest.param("tutorial005_py39"), + pytest.param("tutorial005_an_py39"), ], ) def get_client(request: pytest.FixtureRequest) -> TestClient: diff --git a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial006.py b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial006.py index abfd54618..561c4d86c 100644 --- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial006.py +++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial006.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_pydanticv2 +from ...utils import needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,9 +11,8 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial006"), - pytest.param("tutorial006_an"), - pytest.param("tutorial006_an_py39", marks=needs_py39), + pytest.param("tutorial006_py39"), + pytest.param("tutorial006_an_py39"), ], ) def get_client(request: pytest.FixtureRequest) -> TestClient: diff --git a/tests/test_tutorial/test_query_params/test_tutorial001.py b/tests/test_tutorial/test_query_params/test_tutorial001.py index 28ed43dd0..a459d1915 100644 --- a/tests/test_tutorial/test_query_params/test_tutorial001.py +++ b/tests/test_tutorial/test_query_params/test_tutorial001.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial001"), + pytest.param("tutorial001_py39"), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_query_params/test_tutorial002.py b/tests/test_tutorial/test_query_params/test_tutorial002.py index d65129ca7..bd3d07b98 100644 --- a/tests/test_tutorial/test_query_params/test_tutorial002.py +++ b/tests/test_tutorial/test_query_params/test_tutorial002.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params/test_tutorial003.py b/tests/test_tutorial/test_query_params/test_tutorial003.py index 56b5bc805..3c6d157dc 100644 --- a/tests/test_tutorial/test_query_params/test_tutorial003.py +++ b/tests/test_tutorial/test_query_params/test_tutorial003.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial003"), + pytest.param("tutorial003_py39"), pytest.param("tutorial003_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params/test_tutorial004.py b/tests/test_tutorial/test_query_params/test_tutorial004.py index 3ecf2aab6..04537d684 100644 --- a/tests/test_tutorial/test_query_params/test_tutorial004.py +++ b/tests/test_tutorial/test_query_params/test_tutorial004.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial004"), + pytest.param("tutorial004_py39"), pytest.param("tutorial004_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial001.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial001.py index 9b279f80d..3e059ea51 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial001.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial001.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial001"), + pytest.param("tutorial001_py39"), pytest.param("tutorial001_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial002.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial002.py index acecaa5cf..090f6010c 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial002.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial002.py @@ -11,9 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), - pytest.param("tutorial002_an"), + pytest.param("tutorial002_an_py39"), pytest.param("tutorial002_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial003.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial003.py index d56f30ec9..713186329 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial003.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial003.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial003"), + pytest.param("tutorial003_py39"), pytest.param("tutorial003_py310", marks=needs_py310), - pytest.param("tutorial003_an"), - pytest.param("tutorial003_an_py39", marks=needs_py39), + pytest.param("tutorial003_an_py39"), pytest.param("tutorial003_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial004.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial004.py index 4ca3f46e6..ef85acb0a 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial004.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial004.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -15,10 +15,9 @@ pytestmark = pytest.mark.filterwarnings( @pytest.fixture( name="client", params=[ - pytest.param("tutorial004"), + pytest.param("tutorial004_py39"), pytest.param("tutorial004_py310", marks=needs_py310), - pytest.param("tutorial004_an"), - pytest.param("tutorial004_an_py39", marks=needs_py39), + pytest.param("tutorial004_an_py39"), pytest.param("tutorial004_an_py310", marks=needs_py310), pytest.param("tutorial004_regex_an_py310", marks=needs_py310), ], diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial005.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial005.py index 594e1b878..31f036362 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial005.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial005.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_pydanticv2 +from ...utils import needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,9 +11,8 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial005"), - pytest.param("tutorial005_an"), - pytest.param("tutorial005_an_py39", marks=needs_py39), + pytest.param("tutorial005_py39"), + pytest.param("tutorial005_an_py39"), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial006.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial006.py index 301fbc1bc..2a9b1487e 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial006.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial006.py @@ -11,8 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial006"), - pytest.param("tutorial006_an"), + pytest.param("tutorial006_py39"), pytest.param("tutorial006_an_py39", marks=needs_py39), ], ) diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial007.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial007.py index fb2b8e779..3b30c520c 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial007.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial007.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial007", + pytest.param("tutorial007_py39"), pytest.param("tutorial007_py310", marks=needs_py310), - "tutorial007_an", - pytest.param("tutorial007_an_py39", marks=needs_py39), + pytest.param("tutorial007_an_py39"), pytest.param("tutorial007_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial008.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial008.py index 74f584b56..73ade9ac7 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial008.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial008.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial008", + pytest.param("tutorial008_py39"), pytest.param("tutorial008_py310", marks=needs_py310), - "tutorial008_an", - pytest.param("tutorial008_an_py39", marks=needs_py39), + pytest.param("tutorial008_an_py39"), pytest.param("tutorial008_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_query_params_str_validations/test_tutorial009.py b/tests/test_tutorial/test_query_params_str_validations/test_tutorial009.py index b260e581c..c0fb019cb 100644 --- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial009.py +++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial009.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - "tutorial009", + pytest.param("tutorial009_py39"), pytest.param("tutorial009_py310", marks=needs_py310), - "tutorial009_an", - pytest.param("tutorial009_an_py39", marks=needs_py39), + pytest.param("tutorial009_an_py39"), pytest.param("tutorial009_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_response_directly/test_tutorial002.py b/tests/test_tutorial/test_response_directly/test_tutorial002.py index f5b0baac9..aac038ec0 100644 --- a/tests/test_tutorial/test_response_directly/test_tutorial002.py +++ b/tests/test_tutorial/test_response_directly/test_tutorial002.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), + pytest.param("tutorial002_py39"), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_response_model/test_tutorial001_tutorial001_01.py b/tests/test_tutorial/test_response_model/test_tutorial001_tutorial001_01.py index f79f53dd8..72de40650 100644 --- a/tests/test_tutorial/test_response_model/test_tutorial001_tutorial001_01.py +++ b/tests/test_tutorial/test_response_model/test_tutorial001_tutorial001_01.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,11 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial001"), - pytest.param("tutorial001_py39", marks=needs_py39), + pytest.param("tutorial001_py39"), pytest.param("tutorial001_py310", marks=needs_py310), - pytest.param("tutorial001_01"), - pytest.param("tutorial001_01_py39", marks=needs_py39), + pytest.param("tutorial001_01_py39"), pytest.param("tutorial001_01_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_response_model/test_tutorial002.py b/tests/test_tutorial/test_response_model/test_tutorial002.py index f9b78e75c..f4813705f 100644 --- a/tests/test_tutorial/test_response_model/test_tutorial002.py +++ b/tests/test_tutorial/test_response_model/test_tutorial002.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_response_status_code/test_tutorial001_tutorial002.py b/tests/test_tutorial/test_response_status_code/test_tutorial001_tutorial002.py index 3e2f9fbf6..ddf55a045 100644 --- a/tests/test_tutorial/test_response_status_code/test_tutorial001_tutorial002.py +++ b/tests/test_tutorial/test_response_status_code/test_tutorial001_tutorial002.py @@ -7,8 +7,8 @@ from fastapi.testclient import TestClient @pytest.fixture( name="client", params=[ - pytest.param("tutorial001"), - pytest.param("tutorial002"), + pytest.param("tutorial001_py39"), + pytest.param("tutorial002_py39"), ], ) def get_client(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_schema_extra_example/test_tutorial002.py b/tests/test_tutorial/test_schema_extra_example/test_tutorial002.py index 2636bbb15..ad9ec85a7 100644 --- a/tests/test_tutorial/test_schema_extra_example/test_tutorial002.py +++ b/tests/test_tutorial/test_schema_extra_example/test_tutorial002.py @@ -11,7 +11,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_schema_extra_example/test_tutorial003.py b/tests/test_tutorial/test_schema_extra_example/test_tutorial003.py index c7d771b7a..44bc4848c 100644 --- a/tests/test_tutorial/test_schema_extra_example/test_tutorial003.py +++ b/tests/test_tutorial/test_schema_extra_example/test_tutorial003.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial003"), + pytest.param("tutorial003_py39"), pytest.param("tutorial003_py310", marks=needs_py310), - pytest.param("tutorial003_an"), - pytest.param("tutorial003_an_py39", marks=needs_py39), + pytest.param("tutorial003_an_py39"), pytest.param("tutorial003_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_security/test_tutorial002.py b/tests/test_tutorial/test_security/test_tutorial002.py index dddc686ec..ee2298c8e 100644 --- a/tests/test_tutorial/test_security/test_tutorial002.py +++ b/tests/test_tutorial/test_security/test_tutorial002.py @@ -3,7 +3,7 @@ import importlib import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -11,10 +11,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="client", params=[ - pytest.param("tutorial002"), + pytest.param("tutorial002_py39"), pytest.param("tutorial002_py310", marks=needs_py310), - pytest.param("tutorial002_an"), - pytest.param("tutorial002_an_py39", marks=needs_py39), + pytest.param("tutorial002_an_py39"), pytest.param("tutorial002_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_security/test_tutorial004.py b/tests/test_tutorial/test_security/test_tutorial004.py index 5247b0180..868f21eb7 100644 --- a/tests/test_tutorial/test_security/test_tutorial004.py +++ b/tests/test_tutorial/test_security/test_tutorial004.py @@ -4,7 +4,7 @@ from types import ModuleType import pytest from fastapi.testclient import TestClient -from ...utils import needs_py39, needs_py310, needs_pydanticv2 +from ...utils import needs_py310, needs_pydanticv2 skip_for_pydantic_v1 = needs_pydanticv2 @@ -12,10 +12,9 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="mod", params=[ - pytest.param("tutorial004"), + pytest.param("tutorial004_py39"), pytest.param("tutorial004_py310", marks=needs_py310), - pytest.param("tutorial004_an"), - pytest.param("tutorial004_an_py39", marks=needs_py39), + pytest.param("tutorial004_an_py39"), pytest.param("tutorial004_an_py310", marks=needs_py310), ], ) diff --git a/tests/test_tutorial/test_settings/test_app01.py b/tests/test_tutorial/test_settings/test_app01.py index 3965a7aab..010ef2b6e 100644 --- a/tests/test_tutorial/test_settings/test_app01.py +++ b/tests/test_tutorial/test_settings/test_app01.py @@ -15,7 +15,7 @@ skip_for_pydantic_v1 = needs_pydanticv2 @pytest.fixture( name="mod_name", params=[ - pytest.param("app01"), + pytest.param("app01_py39"), ], ) def get_mod_name(request: pytest.FixtureRequest): diff --git a/tests/test_tutorial/test_static_files/test_tutorial001.py b/tests/test_tutorial/test_static_files/test_tutorial001.py index 9375834a9..4fbf19ae8 100644 --- a/tests/test_tutorial/test_static_files/test_tutorial001.py +++ b/tests/test_tutorial/test_static_files/test_tutorial001.py @@ -11,7 +11,7 @@ def client(): static_dir.mkdir(exist_ok=True) sample_file = static_dir / "sample.txt" sample_file.write_text("This is a sample static file.") - from docs_src.static_files.tutorial001 import app + from docs_src.static_files.tutorial001_py39 import app with TestClient(app) as client: yield client