Merge branch 'release/5.0.2'

s3rius · Jul 23, 2023 · 93c4ffe · 93c4ffe
2 parents 68c1a79 + cd592cb
commit 93c4ffe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/...template/template/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/settings.py b/...template/template/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/settings.py
@@ -7,7 +7,7 @@
 from pydantic import BaseSettings
 
 {%- else %}
-from pydantic_settings import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 {%- endif %}
 
@@ -200,10 +200,20 @@ def rabbit_url(self) -> URL:
         )
     {%- endif %}
 
+    {%- if cookiecutter.pydanticv1 == "True" %}
     class Config:
         env_file = ".env"
         env_prefix = "{{cookiecutter.project_name | upper }}_"
         env_file_encoding = "utf-8"
 
+    {%- else %}
+    model_config = SettingsConfigDict(
+        env_file = ".env",
+        env_prefix = "{{cookiecutter.project_name | upper }}_",
+        env_file_encoding = "utf-8",
+    )
+    {%- endif %}
+
+
 
 settings = Settings()
diff --git a/...ookiecutter.project_name}}/{{cookiecutter.project_name}}/static/docs/swagger-ui-bundle.js b/...ookiecutter.project_name}}/{{cookiecutter.project_name}}/static/docs/swagger-ui-bundle.js
diff --git a/...te/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/static/docs/swagger-ui.css b/...te/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}/static/docs/swagger-ui.css
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastapi_template"
-version = "5.0.1"
+version = "5.0.2"
 description = "Feature-rich robust FastAPI template"
 authors = ["Pavel Kirilin <[email protected]>"]
 packages = [{ include = "fastapi_template" }]