diff --git a/docs/providers/configuration.rst b/docs/providers/configuration.rst index 3e4696f1..5b7fcbf5 100644 --- a/docs/providers/configuration.rst +++ b/docs/providers/configuration.rst @@ -223,7 +223,7 @@ the container will call ``config.from_pydantic()`` automatically: or install ``pydantic`` directly:: - pip install pydantic + pip install pydantic-settings *Don't forget to mirror the changes in the requirements file.* diff --git a/examples/providers/configuration/configuration_pydantic.py b/examples/providers/configuration/configuration_pydantic.py index aaed5d26..eeadd271 100644 --- a/examples/providers/configuration/configuration_pydantic.py +++ b/examples/providers/configuration/configuration_pydantic.py @@ -3,7 +3,7 @@ import os from dependency_injector import containers, providers -from pydantic import BaseSettings, Field +from pydantic_settings import BaseSettings, Field # Emulate environment variables os.environ["AWS_ACCESS_KEY_ID"] = "KEY" diff --git a/examples/providers/configuration/configuration_pydantic_init.py b/examples/providers/configuration/configuration_pydantic_init.py index f904d9df..cfc34f7b 100644 --- a/examples/providers/configuration/configuration_pydantic_init.py +++ b/examples/providers/configuration/configuration_pydantic_init.py @@ -3,7 +3,7 @@ import os from dependency_injector import containers, providers -from pydantic import BaseSettings, Field +from pydantic_settings import BaseSettings, Field # Emulate environment variables os.environ["AWS_ACCESS_KEY_ID"] = "KEY" diff --git a/requirements-dev.txt b/requirements-dev.txt index 2c101e8c..8b4ff967 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -11,7 +11,7 @@ mypy pyyaml httpx fastapi -pydantic +pydantic-settings numpy scipy boto3 diff --git a/setup.py b/setup.py index 3edd5c08..aa157e64 100644 --- a/setup.py +++ b/setup.py @@ -76,7 +76,7 @@ def _open(filename): "pyyaml", ], "pydantic": [ - "pydantic", + "pydantic-settings", ], "flask": [ "flask", diff --git a/src/dependency_injector/providers.pyi b/src/dependency_injector/providers.pyi index 83d6ca88..44885689 100644 --- a/src/dependency_injector/providers.pyi +++ b/src/dependency_injector/providers.pyi @@ -27,7 +27,7 @@ except ImportError: yaml = None try: - import pydantic + import pydantic_settings as pydantic except ImportError: pydantic = None diff --git a/src/dependency_injector/providers.pyx b/src/dependency_injector/providers.pyx index 8208ad63..5bc50334 100644 --- a/src/dependency_injector/providers.pyx +++ b/src/dependency_injector/providers.pyx @@ -49,7 +49,7 @@ except ImportError: yaml = None try: - import pydantic + import pydantic_settings as pydantic except ImportError: pydantic = None diff --git a/tests/typing/configuration.py b/tests/typing/configuration.py index 386689d2..5a0d3d28 100644 --- a/tests/typing/configuration.py +++ b/tests/typing/configuration.py @@ -1,7 +1,7 @@ from pathlib import Path from dependency_injector import providers -from pydantic import BaseSettings as PydanticSettings +from pydantic_settings import BaseSettings as PydanticSettings # Test 1: to check the getattr diff --git a/tests/unit/providers/configuration/test_from_pydantic_py36.py b/tests/unit/providers/configuration/test_from_pydantic_py36.py index f5a2c97e..5fc6a64f 100644 --- a/tests/unit/providers/configuration/test_from_pydantic_py36.py +++ b/tests/unit/providers/configuration/test_from_pydantic_py36.py @@ -1,6 +1,6 @@ """Configuration.from_pydantic() tests.""" -import pydantic +import pydantic_settings as pydantic from dependency_injector import providers, errors from pytest import fixture, mark, raises diff --git a/tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py b/tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py index 08234f15..5d791e2b 100644 --- a/tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py +++ b/tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py @@ -1,6 +1,6 @@ """Configuration.from_pydantic() tests.""" -import pydantic +import pydantic_settings as pydantic from dependency_injector import providers from pytest import fixture, mark, raises diff --git a/tox.ini b/tox.ini index f436345c..034e9b89 100644 --- a/tox.ini +++ b/tox.ini @@ -16,7 +16,7 @@ deps= mypy_boto3_s3 extras= yaml - pydantic + pydantic-settings flask aiohttp commands = pytest -c tests/.configs/pytest.ini