From 7b63baa181cf69501a6a69274e1c8e2e334133dd Mon Sep 17 00:00:00 2001 From: Motoki saito Date: Sat, 26 Aug 2023 12:19:49 +0900 Subject: [PATCH] =?UTF-8?q?platformdirs=E3=82=92=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=20(#736)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- poetry.lock | 13 +------------ pyproject.toml | 2 +- requirements-dev.txt | 5 ++--- requirements-license.txt | 2 +- requirements-test.txt | 3 +-- requirements.txt | 2 +- voicevox_engine/utility/path_utility.py | 2 +- 7 files changed, 8 insertions(+), 21 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4d21335d0..5b697c69b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -42,17 +42,6 @@ doc = ["Sphinx", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd- test = ["anyio[trio]", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] trio = ["trio (<0.22)"] -[[package]] -name = "appdirs" -version = "1.4.4" -description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -optional = false -python-versions = "*" -files = [ - {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, - {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, -] - [[package]] name = "asgiref" version = "3.7.2" @@ -2380,4 +2369,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "~3.11" -content-hash = "2e48da102cf90ac7623e393ba46b79bcf6b80c90be3b34ff17f36db5747e903d" +content-hash = "d3e9daf9c938e3e36cb2defe1a5891d46edc28d981d6f3ccf0561610a0e83eef" diff --git a/pyproject.toml b/pyproject.toml index 521836766..f459faf9f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,11 +50,11 @@ soundfile = "^0.10.3.post1" scipy = "^1.7.1" pyyaml = "^6.0" pyworld = "^0.3.0" -appdirs = "^1.4.4" requests = "^2.28.1" jinja2 = "^3.1.2" pyopenjtalk = {git = "https://github.com/VOICEVOX/pyopenjtalk", rev = "acd4f02d2af3129382c151590238b9370465e360"} semver = "^3.0.0" +platformdirs = "^3.10.0" [tool.poetry.group.dev.dependencies] cython = "^0.29.34,>=0.29.33" # NOTE: for Python 3.11 diff --git a/requirements-dev.txt b/requirements-dev.txt index 534f047a2..75c47c5ee 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,6 @@ aiofiles==0.7.0 ; python_version >= "3.11" and python_version < "3.12" altgraph==0.17.3 ; python_version >= "3.11" and python_version < "3.12" anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12" -appdirs==1.4.4 ; python_version >= "3.11" and python_version < "3.12" asgiref==3.7.2 ; python_version >= "3.11" and python_version < "3.12" atomicwrites==1.4.1 ; python_version >= "3.11" and python_version < "3.12" attrs==23.1.0 ; python_version >= "3.11" and python_version < "3.12" @@ -22,7 +21,7 @@ dulwich==0.21.5 ; python_version >= "3.11" and python_version < "3.12" fastapi==0.70.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" -identify==2.5.26 ; python_version >= "3.11" and python_version < "3.12" +identify==2.5.27 ; python_version >= "3.11" and python_version < "3.12" idna==3.4 ; python_version >= "3.11" and python_version < "3.12" importlib-metadata==6.8.0 ; python_version >= "3.11" and python_version < "3.12" installer==0.7.0 ; python_version >= "3.11" and python_version < "3.12" @@ -44,7 +43,7 @@ pkginfo==1.9.6 ; python_version >= "3.11" and python_version < "3.12" platformdirs==3.10.0 ; python_version >= "3.11" and python_version < "3.12" poetry-core==1.7.0 ; python_version >= "3.11" and python_version < "3.12" poetry-plugin-export==1.5.0 ; python_version >= "3.11" and python_version < "3.12" -poetry==1.6.0 ; python_version >= "3.11" and python_version < "3.12" +poetry==1.6.1 ; 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" diff --git a/requirements-license.txt b/requirements-license.txt index d771eb955..af5c876fe 100644 --- a/requirements-license.txt +++ b/requirements-license.txt @@ -1,6 +1,5 @@ aiofiles==0.7.0 ; python_version >= "3.11" and python_version < "3.12" anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12" -appdirs==1.4.4 ; python_version >= "3.11" and python_version < "3.12" asgiref==3.7.2 ; python_version >= "3.11" and python_version < "3.12" certifi==2023.7.22 ; python_version >= "3.11" and python_version < "3.12" cffi==1.15.1 ; python_version >= "3.11" and python_version < "3.12" @@ -15,6 +14,7 @@ jinja2==3.1.2 ; python_version >= "3.11" and python_version < "3.12" markupsafe==2.1.3 ; python_version >= "3.11" and python_version < "3.12" numpy==1.25.2 ; python_version >= "3.11" and python_version < "3.12" pip-licenses==4.3.2 ; python_version >= "3.11" and python_version < "3.12" +platformdirs==3.10.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.12 ; python_version >= "3.11" and python_version < "3.12" diff --git a/requirements-test.txt b/requirements-test.txt index 4b0d0de89..7270803fa 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,5 @@ aiofiles==0.7.0 ; python_version >= "3.11" and python_version < "3.12" anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12" -appdirs==1.4.4 ; python_version >= "3.11" and python_version < "3.12" asgiref==3.7.2 ; python_version >= "3.11" and python_version < "3.12" atomicwrites==1.4.1 ; python_version >= "3.11" and python_version < "3.12" and sys_platform == "win32" attrs==23.1.0 ; python_version >= "3.11" and python_version < "3.12" @@ -55,7 +54,7 @@ platformdirs==3.10.0 ; python_version >= "3.11" and python_version < "3.12" pluggy==1.2.0 ; python_version >= "3.11" and python_version < "3.12" poetry-core==1.7.0 ; python_version >= "3.11" and python_version < "3.12" poetry-plugin-export==1.5.0 ; python_version >= "3.11" and python_version < "3.12" -poetry==1.6.0 ; python_version >= "3.11" and python_version < "3.12" +poetry==1.6.1 ; python_version >= "3.11" and python_version < "3.12" ptyprocess==0.7.0 ; python_version >= "3.11" and python_version < "3.12" py==1.11.0 ; python_version >= "3.11" and python_version < "3.12" pycodestyle==2.11.0 ; python_version >= "3.11" and python_version < "3.12" diff --git a/requirements.txt b/requirements.txt index cf6f79d1a..199b23a9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ aiofiles==0.7.0 ; python_version >= "3.11" and python_version < "3.12" anyio==3.7.1 ; python_version >= "3.11" and python_version < "3.12" -appdirs==1.4.4 ; python_version >= "3.11" and python_version < "3.12" asgiref==3.7.2 ; python_version >= "3.11" and python_version < "3.12" certifi==2023.7.22 ; python_version >= "3.11" and python_version < "3.12" cffi==1.15.1 ; python_version >= "3.11" and python_version < "3.12" @@ -14,6 +13,7 @@ idna==3.4 ; python_version >= "3.11" and python_version < "3.12" jinja2==3.1.2 ; python_version >= "3.11" and python_version < "3.12" markupsafe==2.1.3 ; python_version >= "3.11" and python_version < "3.12" numpy==1.25.2 ; python_version >= "3.11" and python_version < "3.12" +platformdirs==3.10.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.12 ; python_version >= "3.11" and python_version < "3.12" pyopenjtalk @ git+https://github.com/VOICEVOX/pyopenjtalk@acd4f02d2af3129382c151590238b9370465e360 ; python_version >= "3.11" and python_version < "3.12" diff --git a/voicevox_engine/utility/path_utility.py b/voicevox_engine/utility/path_utility.py index 4de943624..7c46ad40b 100644 --- a/voicevox_engine/utility/path_utility.py +++ b/voicevox_engine/utility/path_utility.py @@ -3,7 +3,7 @@ import traceback from pathlib import Path -from appdirs import user_data_dir +from platformdirs import user_data_dir def engine_root() -> Path: