Skip to content

Commit a5e9bf6

Browse files
authored
Merge pull request #10 from mqcmd196/PR/fix-voicevox-build
[VOICEVOX] Upgrade pyopenjtalk and lock versions in requirements
2 parents cdef654 + a87fe11 commit a5e9bf6

File tree

4 files changed

+61
-2
lines changed

4 files changed

+61
-2
lines changed

3rdparty/voicevox/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set(INSTALL_DIR ${PROJECT_SOURCE_DIR})
1313
catkin_package()
1414

1515
catkin_generate_virtualenv(
16-
INPUT_REQUIREMENTS requirements.in
16+
INPUT_REQUIREMENTS requirements_$ENV{ROS_DISTRO}.txt
1717
PYTHON_INTERPRETER python3
1818
USE_SYSTEM_PACKAGES FALSE
1919
)

3rdparty/voicevox/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PyYAML
22
aiofiles
33
appdirs
44
fastapi
5-
git+https://github.com/VOICEVOX/pyopenjtalk@a85521a0a0f298f08d9e9b24987b3c77eb4aaff5#egg=pyopenjtalk
5+
git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88#egg=pyopenjtalk
66
numpy
77
python-multipart
88
pyworld
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
cython==0.29.32 # via pyopenjtalk, pyworld
2+
aiofiles==0.8.0 # via -r requirements.in
3+
anyio==3.6.1 # via starlette
4+
appdirs==1.4.4 # via -r requirements.in
5+
asgiref==3.4.1 # via uvicorn
6+
cffi==1.15.1 # via soundfile
7+
click==8.0.4 # via uvicorn
8+
contextlib2==21.6.0 # via starlette
9+
contextvars==2.4 # via anyio, sniffio
10+
dataclasses==0.8 # via anyio, h11, pydantic
11+
fastapi==0.83.0 # via -r requirements.in
12+
h11==0.13.0 # via uvicorn
13+
idna==3.4 # via anyio
14+
immutables==0.19 # via contextvars
15+
importlib-metadata==4.8.3 # via click
16+
importlib-resources==5.4.0 # via tqdm
17+
numpy==1.19.5 # via -r requirements.in, pyopenjtalk, pyworld, scipy
18+
pycparser==2.21 # via cffi
19+
pydantic==1.9.2 # via fastapi
20+
git+https://github.com/mqcmd196/pyopenjtalk@4f6e725bb03af721413d9966d361e6384b6fde47#egg=pyopenjtalk
21+
python-multipart==0.0.5 # via -r requirements.in
22+
pyworld==0.3.0 # via -r requirements.in
23+
pyyaml==6.0 # via -r requirements.in
24+
scipy==1.5.4 # via -r requirements.in
25+
six==1.16.0 # via pyopenjtalk, python-multipart
26+
sniffio==1.2.0 # via anyio
27+
soundfile==0.11.0 # via -r requirements.in
28+
starlette==0.19.1 # via fastapi
29+
tqdm==4.64.1 # via pyopenjtalk
30+
typing-extensions==4.1.1 # via anyio, asgiref, h11, importlib-metadata, pydantic, starlette, uvicorn
31+
uvicorn==0.16.0 # via -r requirements.in
32+
zipp==3.6.0 # via importlib-metadata, importlib-resources
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
aiofiles==23.2.1 # via -r requirements.in
2+
annotated-types==0.6.0 # via pydantic
3+
anyio==4.3.0 # via starlette
4+
appdirs==1.4.4 # via -r requirements.in
5+
cffi==1.16.0 # via soundfile
6+
click==8.1.7 # via uvicorn
7+
cython==3.0.10 # via pyopenjtalk, pyworld
8+
exceptiongroup==1.2.0 # via anyio
9+
fastapi==0.110.1 # via -r requirements.in
10+
h11==0.14.0 # via uvicorn
11+
idna==3.6 # via anyio
12+
numpy==1.24.4 # via -r requirements.in, pyopenjtalk, pyworld, scipy
13+
pycparser==2.22 # via cffi
14+
pydantic-core==2.16.3 # via pydantic
15+
pydantic==2.6.4 # via fastapi
16+
git+https://github.com/VOICEVOX/pyopenjtalk@b35fc89fe42948a28e33aed886ea145a51113f88#egg=pyopenjtalk # via -r requirements.in
17+
python-multipart==0.0.9 # via -r requirements.in
18+
pyworld==0.3.4 # via -r requirements.in
19+
pyyaml==6.0.1 # via -r requirements.in
20+
scipy==1.10.1 # via -r requirements.in
21+
six==1.16.0 # via pyopenjtalk
22+
sniffio==1.3.1 # via anyio
23+
soundfile==0.12.1 # via -r requirements.in
24+
starlette==0.37.2 # via fastapi
25+
tqdm==4.66.2 # via pyopenjtalk
26+
typing-extensions==4.11.0 # via annotated-types, anyio, fastapi, pydantic, pydantic-core, starlette, uvicorn
27+
uvicorn==0.29.0 # via -r requirements.in

0 commit comments

Comments
 (0)