From 47eba9f69b01d670496c7e37a18a7bc1247f12ab Mon Sep 17 00:00:00 2001 From: Ryo Yamashita Date: Thu, 26 Oct 2023 01:16:49 +0900 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E4=BE=9D=E5=AD=98?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 13 ------- _typos.toml | 1 - crates/downloader/Cargo.toml | 2 - crates/voicevox_core/Cargo.toml | 3 -- crates/voicevox_core_java_api/Cargo.toml | 3 +- crates/voicevox_core_python_api/Cargo.toml | 3 +- crates/voicevox_core_python_api/poetry.lock | 39 +------------------ .../voicevox_core_python_api/pyproject.toml | 3 +- .../python/test/conftest.py | 2 - .../python/voicevox_core/_rust.pyi | 5 +-- deny.toml | 1 - 11 files changed, 5 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee536102a..dc20aab6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1163,11 +1163,9 @@ dependencies = [ "futures-core", "futures-util", "indicatif", - "itertools", "octocrab", "once_cell", "parse-display", - "platforms", "rayon", "reqwest", "rstest", @@ -2670,12 +2668,6 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" -[[package]] -name = "platforms" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" - [[package]] name = "polling" version = "2.3.0" @@ -4281,7 +4273,6 @@ dependencies = [ "derive_more", "duplicate", "easy-ext", - "flate2", "fs-err", "futures", "heck", @@ -4297,8 +4288,6 @@ dependencies = [ "rstest", "serde", "serde_json", - "strum", - "tar", "tempfile", "test_util", "thiserror", @@ -4362,7 +4351,6 @@ dependencies = [ "serde_json", "test_util", "tokio", - "tracing", "tracing-subscriber", "uuid", "voicevox_core", @@ -4382,7 +4370,6 @@ dependencies = [ "serde_json", "test_util", "tokio", - "tracing", "uuid", "voicevox_core", ] diff --git a/_typos.toml b/_typos.toml index 836b1d79a..b70ddc608 100644 --- a/_typos.toml +++ b/_typos.toml @@ -2,7 +2,6 @@ # Instruction: https://github.com/marketplace/actions/typos-action#getting-started [default.extend-identifiers] -NDArray="NDArray" # numpy NdArray="NdArray" # onnxruntime::session::NdArray [default.extend-words] diff --git a/crates/downloader/Cargo.toml b/crates/downloader/Cargo.toml index 5b48dd1f3..7c45a74ca 100644 --- a/crates/downloader/Cargo.toml +++ b/crates/downloader/Cargo.toml @@ -18,11 +18,9 @@ fs-err.workspace = true futures-core = "0.3.25" futures-util = "0.3.25" indicatif = "0.17.3" -itertools.workspace = true octocrab = { version = "0.19.0", default-features = false, features = ["rustls-tls", "stream"] } once_cell.workspace = true parse-display = "0.8.2" -platforms = "3.0.2" rayon = "1.6.1" reqwest = { version = "0.11.13", default-features = false, features = ["rustls-tls", "stream"] } strum.workspace = true diff --git a/crates/voicevox_core/Cargo.toml b/crates/voicevox_core/Cargo.toml index c2159782c..3a23b794a 100644 --- a/crates/voicevox_core/Cargo.toml +++ b/crates/voicevox_core/Cargo.toml @@ -26,7 +26,6 @@ once_cell.workspace = true regex.workspace = true serde.workspace = true serde_json.workspace = true -strum.workspace = true tempfile.workspace = true thiserror.workspace = true tokio.workspace = true @@ -42,11 +41,9 @@ git = "https://github.com/VOICEVOX/open_jtalk-rs.git" rev = "a16714ce16dec76fd0e3041a7acfa484921db3b5" [dev-dependencies] -flate2 = "1.0.24" heck = "0.4.0" pretty_assertions = "1.3.0" rstest.workspace = true -tar = "0.4.38" test_util.workspace = true [target."cfg(windows)".dependencies] diff --git a/crates/voicevox_core_java_api/Cargo.toml b/crates/voicevox_core_java_api/Cargo.toml index ecf6d8f79..325d28bd2 100644 --- a/crates/voicevox_core_java_api/Cargo.toml +++ b/crates/voicevox_core_java_api/Cargo.toml @@ -18,10 +18,9 @@ jni = "0.21.1" once_cell.workspace = true serde_json.workspace = true tokio.workspace = true -tracing.workspace = true tracing-subscriber.workspace = true uuid.workspace = true voicevox_core.workspace = true [dev-dependencies] -test_util.workspace = true +test_util.workspace = true # only for it's build script diff --git a/crates/voicevox_core_python_api/Cargo.toml b/crates/voicevox_core_python_api/Cargo.toml index a5b09bd6e..195b90c28 100644 --- a/crates/voicevox_core_python_api/Cargo.toml +++ b/crates/voicevox_core_python_api/Cargo.toml @@ -23,8 +23,7 @@ pyo3-asyncio = { version = "0.18.0", features = ["tokio-runtime"] } pyo3-log = "0.8.0" serde.workspace = true serde_json.workspace = true -test_util.workspace = true +test_util.workspace = true # only for it's build script tokio.workspace = true -tracing.workspace = true uuid.workspace = true voicevox_core.workspace = true diff --git a/crates/voicevox_core_python_api/poetry.lock b/crates/voicevox_core_python_api/poetry.lock index 82cffe35c..64d3c4561 100644 --- a/crates/voicevox_core_python_api/poetry.lock +++ b/crates/voicevox_core_python_api/poetry.lock @@ -488,43 +488,6 @@ files = [ {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, ] -[[package]] -name = "numpy" -version = "1.24.4" -description = "Fundamental package for array computing in Python" -optional = false -python-versions = ">=3.8" -files = [ - {file = "numpy-1.24.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c0bfb52d2169d58c1cdb8cc1f16989101639b34c7d3ce60ed70b19c63eba0b64"}, - {file = "numpy-1.24.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ed094d4f0c177b1b8e7aa9cba7d6ceed51c0e569a5318ac0ca9a090680a6a1b1"}, - {file = "numpy-1.24.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:79fc682a374c4a8ed08b331bef9c5f582585d1048fa6d80bc6c35bc384eee9b4"}, - {file = "numpy-1.24.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ffe43c74893dbf38c2b0a1f5428760a1a9c98285553c89e12d70a96a7f3a4d6"}, - {file = "numpy-1.24.4-cp310-cp310-win32.whl", hash = "sha256:4c21decb6ea94057331e111a5bed9a79d335658c27ce2adb580fb4d54f2ad9bc"}, - {file = "numpy-1.24.4-cp310-cp310-win_amd64.whl", hash = "sha256:b4bea75e47d9586d31e892a7401f76e909712a0fd510f58f5337bea9572c571e"}, - {file = "numpy-1.24.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f136bab9c2cfd8da131132c2cf6cc27331dd6fae65f95f69dcd4ae3c3639c810"}, - {file = "numpy-1.24.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e2926dac25b313635e4d6cf4dc4e51c8c0ebfed60b801c799ffc4c32bf3d1254"}, - {file = "numpy-1.24.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:222e40d0e2548690405b0b3c7b21d1169117391c2e82c378467ef9ab4c8f0da7"}, - {file = "numpy-1.24.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7215847ce88a85ce39baf9e89070cb860c98fdddacbaa6c0da3ffb31b3350bd5"}, - {file = "numpy-1.24.4-cp311-cp311-win32.whl", hash = "sha256:4979217d7de511a8d57f4b4b5b2b965f707768440c17cb70fbf254c4b225238d"}, - {file = "numpy-1.24.4-cp311-cp311-win_amd64.whl", hash = "sha256:b7b1fc9864d7d39e28f41d089bfd6353cb5f27ecd9905348c24187a768c79694"}, - {file = "numpy-1.24.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1452241c290f3e2a312c137a9999cdbf63f78864d63c79039bda65ee86943f61"}, - {file = "numpy-1.24.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:04640dab83f7c6c85abf9cd729c5b65f1ebd0ccf9de90b270cd61935eef0197f"}, - {file = "numpy-1.24.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5425b114831d1e77e4b5d812b69d11d962e104095a5b9c3b641a218abcc050e"}, - {file = "numpy-1.24.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd80e219fd4c71fc3699fc1dadac5dcf4fd882bfc6f7ec53d30fa197b8ee22dc"}, - {file = "numpy-1.24.4-cp38-cp38-win32.whl", hash = "sha256:4602244f345453db537be5314d3983dbf5834a9701b7723ec28923e2889e0bb2"}, - {file = "numpy-1.24.4-cp38-cp38-win_amd64.whl", hash = "sha256:692f2e0f55794943c5bfff12b3f56f99af76f902fc47487bdfe97856de51a706"}, - {file = "numpy-1.24.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2541312fbf09977f3b3ad449c4e5f4bb55d0dbf79226d7724211acc905049400"}, - {file = "numpy-1.24.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9667575fb6d13c95f1b36aca12c5ee3356bf001b714fc354eb5465ce1609e62f"}, - {file = "numpy-1.24.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3a86ed21e4f87050382c7bc96571755193c4c1392490744ac73d660e8f564a9"}, - {file = "numpy-1.24.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d11efb4dbecbdf22508d55e48d9c8384db795e1b7b51ea735289ff96613ff74d"}, - {file = "numpy-1.24.4-cp39-cp39-win32.whl", hash = "sha256:6620c0acd41dbcb368610bb2f4d83145674040025e5536954782467100aa8835"}, - {file = "numpy-1.24.4-cp39-cp39-win_amd64.whl", hash = "sha256:befe2bf740fd8373cf56149a5c23a0f601e82869598d41f8e188a0e9869926f8"}, - {file = "numpy-1.24.4-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:31f13e25b4e304632a4619d0e0777662c2ffea99fcae2029556b17d8ff958aef"}, - {file = "numpy-1.24.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95f7ac6540e95bc440ad77f56e520da5bf877f87dca58bd095288dce8940532a"}, - {file = "numpy-1.24.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e98f220aa76ca2a977fe435f5b04d7b3470c0a2e6312907b37ba6068f26787f2"}, - {file = "numpy-1.24.4.tar.gz", hash = "sha256:80f5e3a4e498641401868df4208b74581206afbee7cf7b8329daae82676d9463"}, -] - [[package]] name = "packaging" version = "23.2" @@ -1028,4 +991,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.13" -content-hash = "8ced8ffd3fb09495d631919b1624509874336ac7ffb5c7eb0566fbea88334b85" +content-hash = "1df8e3a1b5c0e3b221a0ffee223e32c042e79977d9e7210116555d084d948588" diff --git a/crates/voicevox_core_python_api/pyproject.toml b/crates/voicevox_core_python_api/pyproject.toml index b9fca9593..e95777b72 100644 --- a/crates/voicevox_core_python_api/pyproject.toml +++ b/crates/voicevox_core_python_api/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "voicevox_core" requires-python = ">=3.8" -dependencies = ["numpy", "pydantic>=1.9.2,<2"] +dependencies = ["pydantic>=1.9.2,<2"] description = "VOICEVOX CORE の Python バインディングです。" authors = [{ name = "Hiroshiba", email = "hihokaruta@gmail.com" }] classifiers = [ @@ -35,7 +35,6 @@ authors = [] [tool.poetry.dependencies] python = ">=3.8,<3.13" -numpy = ">=1,<2" pydantic = ">=1.9.2,<2" [tool.poetry.group.docs.dependencies] diff --git a/crates/voicevox_core_python_api/python/test/conftest.py b/crates/voicevox_core_python_api/python/test/conftest.py index 54449324c..628f4dc56 100644 --- a/crates/voicevox_core_python_api/python/test/conftest.py +++ b/crates/voicevox_core_python_api/python/test/conftest.py @@ -1,10 +1,8 @@ import json import os -from dataclasses import dataclass from pathlib import Path from typing import List, TypedDict -import numpy as np import pytest root_dir = Path(os.path.dirname(os.path.abspath(__file__))) diff --git a/crates/voicevox_core_python_api/python/voicevox_core/_rust.pyi b/crates/voicevox_core_python_api/python/voicevox_core/_rust.pyi index bd110f892..598415d37 100644 --- a/crates/voicevox_core_python_api/python/voicevox_core/_rust.pyi +++ b/crates/voicevox_core_python_api/python/voicevox_core/_rust.pyi @@ -1,10 +1,7 @@ from pathlib import Path -from typing import TYPE_CHECKING, Dict, Final, List, Literal, Union +from typing import TYPE_CHECKING, Dict, List, Literal, Union from uuid import UUID -import numpy as np -from numpy.typing import NDArray - if TYPE_CHECKING: from voicevox_core import ( AccelerationMode, diff --git a/deny.toml b/deny.toml index b4b4d5872..38e915eb7 100644 --- a/deny.toml +++ b/deny.toml @@ -52,7 +52,6 @@ allow-build-scripts = [ { name = "num-traits", version = "0.2" }, # https://docs.rs/crate/num-traits/0.2/source/build.rs { name = "onnxruntime", version = "=0.1.0" }, # https://github.com/VOICEVOX/onnxruntime-rs/blob/405f62fb53df1b59b0e69adafbd1c28e4d5c2787/onnxruntime/build.rs { name = "parking_lot_core", version = "0.9" }, # https://docs.rs/crate/parking_lot_core/0.9/source/build.rs - { name = "platforms", version = "3" }, # https://docs.rs/crate/platforms/3.0.2/source/build.rs { name = "polling", version = "2" }, # https://docs.rs/crate/polling/2/source/build.rs { name = "portable-atomic", version = "0.3" }, # https://docs.rs/crate/portable-atomic/0.3.19/source/build.rs { name = "proc-macro-error", version = "1" }, # https://docs.rs/crate/proc-macro-error/1/source/build.rs