Fix applying `needs_pydanticv2` to modules

7 months ago · 8c8addfb59
50 changed files with 84 additions and 74 deletions
--- a/tests/test_tutorial/test_body/test_tutorial002.py
+++ b/tests/test_tutorial/test_body/test_tutorial002.py
@ -7,11 +7,12 @@ from fastapi.testclient import TestClient
 from ...utils import needs_py310, needs_pydanticv2

 # Remove when deprecating Pydantic v1
-pytestmark = pytest.mark.filterwarnings(
-    "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning"
-)
-
-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = [
+    pytest.mark.filterwarnings(
+        "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning"
+    ),
+    needs_pydanticv2,
+]


@pytest.fixture(
--- a/tests/test_tutorial/test_body/test_tutorial003.py
+++ b/tests/test_tutorial/test_body/test_tutorial003.py
@ -6,11 +6,12 @@ from fastapi.testclient import TestClient
 from ...utils import needs_py310, needs_pydanticv2

 # Remove when deprecating Pydantic v1
-pytestmark = pytest.mark.filterwarnings(
-    "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning"
-)
-
-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = [
+    pytest.mark.filterwarnings(
+        "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning"
+    ),
+    needs_pydanticv2,
+]


@pytest.fixture(
--- a/tests/test_tutorial/test_body/test_tutorial004.py
+++ b/tests/test_tutorial/test_body/test_tutorial004.py
@ -6,11 +6,12 @@ from fastapi.testclient import TestClient
 from ...utils import needs_py310, needs_pydanticv2

 # Remove when deprecating Pydantic v1
-pytestmark = pytest.mark.filterwarnings(
-    "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning"
-)
-
-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = [
+    pytest.mark.filterwarnings(
+        "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning"
+    ),
+    needs_pydanticv2,
+]


@pytest.fixture(
--- a/tests/test_tutorial/test_body_multiple_params/test_tutorial002.py
+++ b/tests/test_tutorial/test_body_multiple_params/test_tutorial002.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_body_multiple_params/test_tutorial004.py
+++ b/tests/test_tutorial/test_body_multiple_params/test_tutorial004.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_body_multiple_params/test_tutorial005.py
+++ b/tests/test_tutorial/test_body_multiple_params/test_tutorial005.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- 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
@ -6,7 +6,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2

 UNTYPED_LIST_SCHEMA = {"type": "array", "items": {}}

--- a/tests/test_tutorial/test_body_nested_models/test_tutorial004.py
+++ b/tests/test_tutorial/test_body_nested_models/test_tutorial004.py
@ -6,7 +6,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_body_nested_models/test_tutorial005.py
+++ b/tests/test_tutorial/test_body_nested_models/test_tutorial005.py
@ -6,7 +6,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_body_nested_models/test_tutorial006.py
+++ b/tests/test_tutorial/test_body_nested_models/test_tutorial006.py
@ -6,7 +6,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_body_nested_models/test_tutorial007.py
+++ b/tests/test_tutorial/test_body_nested_models/test_tutorial007.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_body_nested_models/test_tutorial008.py
+++ b/tests/test_tutorial/test_body_nested_models/test_tutorial008.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_body_updates/test_tutorial002.py
+++ b/tests/test_tutorial/test_body_updates/test_tutorial002.py
@ -5,13 +5,14 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
-
 # Remove when deprecating Pydantic v1
-pytestmark = pytest.mark.filterwarnings(
-    "ignore:The `copy` method is deprecated; use `model_copy` instead.:DeprecationWarning",
-    "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning",
-)
+pytestmark = [
+    pytest.mark.filterwarnings(
+        "ignore:The `copy` method is deprecated; use `model_copy` instead.:DeprecationWarning",
+        "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning",
+    ),
+    needs_pydanticv2,
+]


@pytest.fixture(
--- a/tests/test_tutorial/test_dependencies/test_tutorial001_tutorial001_02.py
+++ b/tests/test_tutorial/test_dependencies/test_tutorial001_tutorial001_02.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_dependencies/test_tutorial002_tutorial003_tutorial004.py
+++ b/tests/test_tutorial/test_dependencies/test_tutorial002_tutorial003_tutorial004.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_dependencies/test_tutorial005.py
+++ b/tests/test_tutorial/test_dependencies/test_tutorial005.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_dependencies/test_tutorial011.py
+++ b/tests/test_tutorial/test_dependencies/test_tutorial011.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_encoder/test_tutorial001.py
+++ b/tests/test_tutorial/test_encoder/test_tutorial001.py
@ -6,7 +6,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_extra_models/test_tutorial001_tutorial002.py
+++ b/tests/test_tutorial/test_extra_models/test_tutorial001_tutorial002.py
@ -6,12 +6,13 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
-
 # Remove when deprecating Pydantic v1
-pytestmark = pytest.mark.filterwarnings(
-    "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning",
-)
+pytestmark = [
+    pytest.mark.filterwarnings(
+        "ignore:The `dict` method is deprecated; use `model_dump` instead.:DeprecationWarning",
+    ),
+    needs_pydanticv2,
+]


@pytest.fixture(
--- a/tests/test_tutorial/test_path_operation_configurations/test_tutorial001.py
+++ b/tests/test_tutorial/test_path_operation_configurations/test_tutorial001.py
@ -6,7 +6,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_path_operation_configurations/test_tutorial002.py
+++ b/tests/test_tutorial/test_path_operation_configurations/test_tutorial002.py
@ -6,7 +6,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_path_operation_configurations/test_tutorial003_tutorial004.py
+++ b/tests/test_tutorial/test_path_operation_configurations/test_tutorial003_tutorial004.py
@ -7,7 +7,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


 DESCRIPTIONS = {
--- a/tests/test_tutorial/test_path_params/test_tutorial002.py
+++ b/tests/test_tutorial/test_path_params/test_tutorial002.py
@ -2,8 +2,12 @@ from fastapi.testclient import TestClient

 from docs_src.path_params.tutorial002_py39 import app

+from ...utils import needs_pydanticv2
+
 client = TestClient(app)

+pytestmark = needs_pydanticv2
+

 def test_get_items():
    response = client.get("/items/1")
--- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial001.py
+++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial001.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- 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
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial004.py
+++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial004.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial005.py
+++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial005.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial006.py
+++ b/tests/test_tutorial/test_path_params_numeric_validations/test_tutorial006.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params/test_tutorial001.py
+++ b/tests/test_tutorial/test_query_params/test_tutorial001.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params/test_tutorial002.py
+++ b/tests/test_tutorial/test_query_params/test_tutorial002.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params/test_tutorial003.py
+++ b/tests/test_tutorial/test_query_params/test_tutorial003.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params/test_tutorial004.py
+++ b/tests/test_tutorial/test_query_params/test_tutorial004.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial001.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial001.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial002.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial002.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial003.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial003.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial004.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial004.py
@ -5,11 +5,12 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
-
-pytestmark = pytest.mark.filterwarnings(
-    "ignore:`regex` has been deprecated, please use `pattern` instead:DeprecationWarning"
-)
+pytestmark = [
+    pytest.mark.filterwarnings(
+        "ignore:`regex` has been deprecated, please use `pattern` instead:DeprecationWarning"
+    ),
+    needs_pydanticv2,
+]


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial005.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial005.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial006.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial006.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial006c.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial006c.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial007.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial007.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial008.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial008.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_query_params_str_validations/test_tutorial009.py
+++ b/tests/test_tutorial/test_query_params_str_validations/test_tutorial009.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_response_directly/test_tutorial002.py
+++ b/tests/test_tutorial/test_response_directly/test_tutorial002.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_response_model/test_tutorial001_tutorial001_01.py
+++ b/tests/test_tutorial/test_response_model/test_tutorial001_tutorial001_01.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_response_model/test_tutorial002.py
+++ b/tests/test_tutorial/test_response_model/test_tutorial002.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_schema_extra_example/test_tutorial002.py
+++ b/tests/test_tutorial/test_schema_extra_example/test_tutorial002.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_schema_extra_example/test_tutorial003.py
+++ b/tests/test_tutorial/test_schema_extra_example/test_tutorial003.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_security/test_tutorial002.py
+++ b/tests/test_tutorial/test_security/test_tutorial002.py
@ -5,7 +5,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_security/test_tutorial004.py
+++ b/tests/test_tutorial/test_security/test_tutorial004.py
@ -7,7 +7,7 @@ from fastapi.testclient import TestClient

 from ...utils import needs_py310, needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(
--- a/tests/test_tutorial/test_settings/test_app01.py
+++ b/tests/test_tutorial/test_settings/test_app01.py
@ -9,7 +9,7 @@ from pytest import MonkeyPatch

 from ...utils import needs_pydanticv2

-skip_for_pydantic_v1 = needs_pydanticv2
+pytestmark = needs_pydanticv2


@pytest.fixture(