ENH: pydanticをv2へ

VOICEVOX · Jun 6, 2024 · 66c6ff1 · 66c6ff1
1 parent a7d8c50
commit 66c6ff1
Show file tree

Hide file tree

Showing 30 changed files with 389 additions and 195 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -56,7 +56,7 @@ pyopenjtalk = { git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "b35fc89f
 semver = "^3.0.0"
 platformdirs = "^4.2.0"
 soxr = "^0.3.6"
-pydantic = "^1.10.15"
+pydantic = "^2.7.3"
 starlette = "^0.37.0"
 
 [tool.poetry.group.dev.dependencies]

diff --git a/requirements-build.txt b/requirements-build.txt
@@ -1,4 +1,5 @@
 altgraph==0.17.4 ; python_version >= "3.11" and python_version < "3.12"
+annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
 anyio==4.3.0 ; python_version >= "3.11" and python_version < "3.12"
 cffi==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
 click==8.1.7 ; python_version >= "3.11" and python_version < "3.12"
@@ -15,7 +16,8 @@ packaging==24.0 ; python_version >= "3.11" and python_version < "3.12"
 pefile==2023.2.7 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "win32"
 platformdirs==4.2.2 ; python_version >= "3.11" and python_version < "3.12"
 pycparser==2.22 ; python_version >= "3.11" and python_version < "3.12"
-pydantic==1.10.15 ; python_version >= "3.11" and python_version < "3.12"
+pydantic-core==2.18.4 ; python_version >= "3.11" and python_version < "3.12"
+pydantic==2.7.3 ; python_version >= "3.11" and python_version < "3.12"
 pyinstaller-hooks-contrib==2024.6 ; python_version >= "3.11" and python_version < "3.12"
 pyinstaller==5.13.2 ; python_version >= "3.11" and python_version < "3.12"
 pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,3 +1,4 @@
+annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
 anyio==4.3.0 ; python_version >= "3.11" and python_version < "3.12"
 attrs==23.2.0 ; python_version >= "3.11" and python_version < "3.12"
 authlib==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
@@ -66,7 +67,8 @@ pre-commit==2.21.0 ; python_version >= "3.11" and python_version < "3.12"
 ptyprocess==0.7.0 ; python_version >= "3.11" and python_version < "3.12"
 pycodestyle==2.11.1 ; python_version >= "3.11" and python_version < "3.12"
 pycparser==2.22 ; python_version >= "3.11" and python_version < "3.12"
-pydantic==1.10.15 ; python_version >= "3.11" and python_version < "3.12"
+pydantic-core==2.18.4 ; python_version >= "3.11" and python_version < "3.12"
+pydantic==2.7.3 ; python_version >= "3.11" and python_version < "3.12"
 pyflakes==3.2.0 ; python_version >= "3.11" and python_version < "3.12"
 pygments==2.18.0 ; python_version >= "3.11" and python_version < "3.12"
 pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/requirements-license.txt b/requirements-license.txt
@@ -1,3 +1,4 @@
+annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
 anyio==4.3.0 ; python_version >= "3.11" and python_version < "3.12"
 cffi==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
 click==8.1.7 ; python_version >= "3.11" and python_version < "3.12"
@@ -13,7 +14,8 @@ pip-licenses==4.4.0 ; python_version >= "3.11" and python_version < "3.12"
 platformdirs==4.2.2 ; python_version >= "3.11" and python_version < "3.12"
 prettytable==3.10.0 ; python_version >= "3.11" and python_version < "3.12"
 pycparser==2.22 ; python_version >= "3.11" and python_version < "3.12"
-pydantic==1.10.15 ; python_version >= "3.11" and python_version < "3.12"
+pydantic-core==2.18.4 ; python_version >= "3.11" and python_version < "3.12"
+pydantic==2.7.3 ; python_version >= "3.11" and python_version < "3.12"
 pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88 ; python_version >= "3.11" and python_version < "3.12"
 python-multipart==0.0.9 ; python_version >= "3.11" and python_version < "3.12"
 pyworld==0.3.4 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
 anyio==4.3.0 ; python_version >= "3.11" and python_version < "3.12"
 cffi==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
 click==8.1.7 ; python_version >= "3.11" and python_version < "3.12"
@@ -11,7 +12,8 @@ markupsafe==2.1.5 ; python_version >= "3.11" and python_version < "3.12"
 numpy==1.26.4 ; python_version >= "3.11" and python_version < "3.12"
 platformdirs==4.2.2 ; python_version >= "3.11" and python_version < "3.12"
 pycparser==2.22 ; python_version >= "3.11" and python_version < "3.12"
-pydantic==1.10.15 ; python_version >= "3.11" and python_version < "3.12"
+pydantic-core==2.18.4 ; python_version >= "3.11" and python_version < "3.12"
+pydantic==2.7.3 ; python_version >= "3.11" and python_version < "3.12"
 pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88 ; python_version >= "3.11" and python_version < "3.12"
 python-multipart==0.0.9 ; python_version >= "3.11" and python_version < "3.12"
 pyworld==0.3.4 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/test/e2e/__snapshots__/test_openapi/test_OpenAPIの形が変わっていないことを確認.json b/test/e2e/__snapshots__/test_openapi/test_OpenAPIの形が変わっていないことを確認.json
diff --git a/.../single_api/user_dict/__snapshots__/test_user_dict_word/test_post_user_dict_word_422.json b/.../single_api/user_dict/__snapshots__/test_user_dict_word/test_post_user_dict_word_422.json