Fix merge conflicts

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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):

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):

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")

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),
     ],
 )

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):

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),
     ],
 )

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),
     ],
 )

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):

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)
 

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 == {

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")

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)
 

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)
 

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)
 

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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)
 

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)
 

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)
 

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)
 

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),
     ],
 )

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:

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:

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:

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:

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):

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],

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):

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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):

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),
     ],
 )

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),
     ],
 )

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):

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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),
     ],
 )

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):

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