Skip to content

Commit

Permalink
ENH: pydanticをv2へ
Browse files Browse the repository at this point in the history
  • Loading branch information
@sabonerune
sabonerune committed May 15, 2024
1 parent 465d369 commit 85435d2
Show file tree
Hide file tree
Showing 29 changed files with 431 additions and 254 deletions.
196 changes: 125 additions & 71 deletions poetry.lock
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ package-mode = false
[tool.poetry.dependencies]
python = "~3.11"
numpy = "^1.20.0"
fastapi = "^0.110.0"
fastapi = "^0.110.2"
python-multipart = "^0.0.5" # NOTE: required by fastapi
uvicorn = "^0.15.0"
uvicorn = "^0.28.0"
soundfile = "^0.12.1"
pyyaml = "^6.0"
pyworld = "^0.3.0"
Expand All @@ -53,8 +53,8 @@ pyopenjtalk = { git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "b35fc89f
semver = "^3.0.0"
platformdirs = "^4.2.0"
soxr = "^0.3.6"
pydantic = "<2"
starlette = "^0.36.3"
pydantic = "^2.7.1"
starlette = "^0"

[tool.poetry.group.dev.dependencies]
pyinstaller = "^5.13"
Expand Down
11 changes: 6 additions & 5 deletions requirements-dev.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
altgraph==0.17.3 ; python_version >= "3.11" and python_version < "3.12"
annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12"
asgiref==3.7.2 ; python_version >= "3.11" and python_version < "3.12"
authlib==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
build==1.0.3 ; python_version >= "3.11" and python_version < "3.12"
cachecontrol[filecache]==0.14.0 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -17,7 +17,7 @@ cython==3.0.7 ; python_version >= "3.11" and python_version < "3.12"
distlib==0.3.7 ; python_version >= "3.11" and python_version < "3.12"
dparse==0.6.4b0 ; python_version >= "3.11" and python_version < "3.12"
dulwich==0.21.5 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.0 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.2 ; python_version >= "3.11" and python_version < "3.12"
fastjsonschema==2.19.1 ; python_version >= "3.11" and python_version < "3.12"
filelock==3.12.2 ; python_version >= "3.11" and python_version < "3.12"
h11==0.14.0 ; python_version >= "3.11" and python_version < "3.12"
Expand Down Expand Up @@ -49,7 +49,8 @@ poetry==1.8.2 ; python_version >= "3.11" and python_version < "3.12"
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"
pycparser==2.21 ; python_version >= "3.11" and python_version < "3.12"
pydantic==1.10.14 ; python_version >= "3.11" and python_version < "3.12"
pydantic-core==2.18.2 ; python_version >= "3.11" and python_version < "3.12"
pydantic==2.7.1 ; python_version >= "3.11" and python_version < "3.12"
pygments==2.17.2 ; python_version >= "3.11" and python_version < "3.12"
pyinstaller-hooks-contrib==2023.7 ; python_version >= "3.11" and python_version < "3.12"
pyinstaller==5.13.2 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -75,14 +76,14 @@ six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
soxr==0.3.7 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.36.3 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.37.2 ; python_version >= "3.11" and python_version < "3.12"
tomlkit==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
tqdm==4.66.1 ; python_version >= "3.11" and python_version < "3.12"
trove-classifiers==2023.8.7 ; python_version >= "3.11" and python_version < "3.12"
typer==0.11.0 ; python_version >= "3.11" and python_version < "3.12"
typing-extensions==4.10.0 ; python_version >= "3.11" and python_version < "3.12"
urllib3==2.2.1 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.15.0 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.28.1 ; python_version >= "3.11" and python_version < "3.12"
virtualenv==20.25.1 ; python_version >= "3.11" and python_version < "3.12"
xattr==1.1.0 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "darwin"
zipp==3.16.2 ; python_version >= "3.11" and python_version < "3.12"
11 changes: 6 additions & 5 deletions requirements-license.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12"
asgiref==3.7.2 ; 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"
colorama==0.4.6 ; python_version >= "3.11" and python_version < "3.12" and platform_system == "Windows"
cython==3.0.7 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.0 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.2 ; python_version >= "3.11" and python_version < "3.12"
h11==0.14.0 ; python_version >= "3.11" and python_version < "3.12"
idna==3.4 ; python_version >= "3.11" and python_version < "3.12"
jinja2==3.1.3 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -14,7 +14,8 @@ pip-licenses==4.3.4 ; python_version >= "3.11" and python_version < "3.12"
platformdirs==4.2.0 ; python_version >= "3.11" and python_version < "3.12"
prettytable==3.8.0 ; python_version >= "3.11" and python_version < "3.12"
pycparser==2.21 ; python_version >= "3.11" and python_version < "3.12"
pydantic==1.10.14 ; python_version >= "3.11" and python_version < "3.12"
pydantic-core==2.18.2 ; python_version >= "3.11" and python_version < "3.12"
pydantic==2.7.1 ; 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.5 ; python_version >= "3.11" and python_version < "3.12"
pyworld==0.3.4 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -24,8 +25,8 @@ six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
soxr==0.3.7 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.36.3 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.37.2 ; python_version >= "3.11" and python_version < "3.12"
tqdm==4.66.1 ; python_version >= "3.11" and python_version < "3.12"
typing-extensions==4.10.0 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.15.0 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.28.1 ; python_version >= "3.11" and python_version < "3.12"
wcwidth==0.2.6 ; python_version >= "3.11" and python_version < "3.12"
11 changes: 6 additions & 5 deletions requirements-test.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12"
asgiref==3.7.2 ; python_version >= "3.11" and python_version < "3.12"
attrs==23.1.0 ; python_version >= "3.11" and python_version < "3.12"
black==24.2.0 ; python_version >= "3.11" and python_version < "3.12"
build==1.0.3 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -20,7 +20,7 @@ dacite==1.8.1 ; python_version >= "3.11" and python_version < "3.12"
distlib==0.3.7 ; python_version >= "3.11" and python_version < "3.12"
docopt==0.6.2 ; python_version >= "3.11" and python_version < "3.12"
dulwich==0.21.5 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.0 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.2 ; python_version >= "3.11" and python_version < "3.12"
fastjsonschema==2.19.1 ; python_version >= "3.11" and python_version < "3.12"
filelock==3.12.2 ; python_version >= "3.11" and python_version < "3.12"
flake8-bugbear==24.2.6 ; python_version >= "3.11" and python_version < "3.12"
Expand Down Expand Up @@ -58,7 +58,8 @@ poetry==1.8.2 ; 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.0 ; python_version >= "3.11" and python_version < "3.12"
pycparser==2.21 ; python_version >= "3.11" and python_version < "3.12"
pydantic==1.10.14 ; python_version >= "3.11" and python_version < "3.12"
pydantic-core==2.18.2 ; python_version >= "3.11" and python_version < "3.12"
pydantic==2.7.1 ; python_version >= "3.11" and python_version < "3.12"
pyflakes==3.2.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"
pyproject-hooks==1.0.0 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -79,7 +80,7 @@ smmap==5.0.0 ; python_version >= "3.11" and python_version < "3.12"
sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
soxr==0.3.7 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.36.3 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.37.2 ; python_version >= "3.11" and python_version < "3.12"
syrupy==4.6.1 ; python_version >= "3.11" and python_version < "3.12"
tomlkit==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
tqdm==4.66.1 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -88,7 +89,7 @@ types-pyyaml==6.0.12.12 ; python_version >= "3.11" and python_version < "3.12"
typing-extensions==4.10.0 ; python_version >= "3.11" and python_version < "3.12"
unidiff==0.7.5 ; python_version >= "3.11" and python_version < "3.12"
urllib3==2.2.1 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.15.0 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.28.1 ; python_version >= "3.11" and python_version < "3.12"
virtualenv==20.25.1 ; python_version >= "3.11" and python_version < "3.12"
xattr==1.1.0 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "darwin"
zipp==3.16.2 ; python_version >= "3.11" and python_version < "3.12"
11 changes: 6 additions & 5 deletions requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
annotated-types==0.6.0 ; python_version >= "3.11" and python_version < "3.12"
anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12"
asgiref==3.7.2 ; 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"
colorama==0.4.6 ; python_version >= "3.11" and python_version < "3.12" and platform_system == "Windows"
cython==3.0.7 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.0 ; python_version >= "3.11" and python_version < "3.12"
fastapi==0.110.2 ; python_version >= "3.11" and python_version < "3.12"
h11==0.14.0 ; python_version >= "3.11" and python_version < "3.12"
idna==3.4 ; python_version >= "3.11" and python_version < "3.12"
jinja2==3.1.3 ; python_version >= "3.11" and python_version < "3.12"
markupsafe==2.1.3 ; python_version >= "3.11" and python_version < "3.12"
numpy==1.26.2 ; python_version >= "3.11" and python_version < "3.12"
platformdirs==4.2.0 ; python_version >= "3.11" and python_version < "3.12"
pycparser==2.21 ; python_version >= "3.11" and python_version < "3.12"
pydantic==1.10.14 ; python_version >= "3.11" and python_version < "3.12"
pydantic-core==2.18.2 ; python_version >= "3.11" and python_version < "3.12"
pydantic==2.7.1 ; 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.5 ; python_version >= "3.11" and python_version < "3.12"
pyworld==0.3.4 ; python_version >= "3.11" and python_version < "3.12"
Expand All @@ -22,7 +23,7 @@ six==1.16.0 ; python_version >= "3.11" and python_version < "3.12"
sniffio==1.3.0 ; python_version >= "3.11" and python_version < "3.12"
soundfile==0.12.1 ; python_version >= "3.11" and python_version < "3.12"
soxr==0.3.7 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.36.3 ; python_version >= "3.11" and python_version < "3.12"
starlette==0.37.2 ; python_version >= "3.11" and python_version < "3.12"
tqdm==4.66.1 ; python_version >= "3.11" and python_version < "3.12"
typing-extensions==4.10.0 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.15.0 ; python_version >= "3.11" and python_version < "3.12"
uvicorn==0.28.1 ; python_version >= "3.11" and python_version < "3.12"
Loading

0 comments on commit 85435d2

Please sign in to comment.