From d0a596d06a57f48839bd685953069dbac8f11ead Mon Sep 17 00:00:00 2001 From: tarepan Date: Sun, 10 Dec 2023 02:07:00 +0900 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86:=20`default=5Fsetting.yml`?= =?UTF-8?q?=20=E6=8B=A1=E5=BC=B5=E5=AD=90=E5=A4=89=E6=9B=B4=20(#837)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- default_setting.yml => default_setting.yaml | 0 run.spec | 2 +- test/e2e/conftest.py | 2 +- voicevox_engine/setting/SettingLoader.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename default_setting.yml => default_setting.yaml (100%) diff --git a/Dockerfile b/Dockerfile index 5a5279235..ef920ecf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -227,7 +227,7 @@ COPY --from=download-onnxruntime-env /opt/onnxruntime /opt/onnxruntime # Add local files ADD ./voicevox_engine /opt/voicevox_engine/voicevox_engine ADD ./docs /opt/voicevox_engine/docs -ADD ./run.py ./generate_licenses.py ./presets.yaml ./default.csv ./default_setting.yml ./engine_manifest.json /opt/voicevox_engine/ +ADD ./run.py ./generate_licenses.py ./presets.yaml ./default.csv ./default_setting.yaml ./engine_manifest.json /opt/voicevox_engine/ ADD ./speaker_info /opt/voicevox_engine/speaker_info ADD ./ui_template /opt/voicevox_engine/ui_template ADD ./engine_manifest_assets /opt/voicevox_engine/engine_manifest_assets diff --git a/default_setting.yml b/default_setting.yaml similarity index 100% rename from default_setting.yml rename to default_setting.yaml diff --git a/run.spec b/run.spec index b84c82408..9f73c6b07 100644 --- a/run.spec +++ b/run.spec @@ -10,7 +10,7 @@ datas = [ ('default.csv', '.'), ('licenses.json', '.'), ('presets.yaml', '.'), - ('default_setting.yml', '.'), + ('default_setting.yaml', '.'), ('ui_template', 'ui_template'), ] datas += collect_data_files('pyopenjtalk') diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py index af21590c1..b656886b6 100644 --- a/test/e2e/conftest.py +++ b/test/e2e/conftest.py @@ -14,7 +14,7 @@ def client(): synthesis_engines = make_synthesis_engines(use_gpu=False) latest_core_version = get_latest_core_version(versions=synthesis_engines.keys()) - setting_loader = SettingLoader(Path("./default_setting.yml")) + setting_loader = SettingLoader(Path("./default_setting.yaml")) preset_manager = PresetManager( # FIXME: impl MockPresetManager preset_path=Path("./presets.yaml"), ) diff --git a/voicevox_engine/setting/SettingLoader.py b/voicevox_engine/setting/SettingLoader.py index a78952e96..3f1669e26 100644 --- a/voicevox_engine/setting/SettingLoader.py +++ b/voicevox_engine/setting/SettingLoader.py @@ -5,7 +5,7 @@ from ..utility import engine_root, get_save_dir from .Setting import Setting -DEFAULT_SETTING_PATH: Path = engine_root() / "default_setting.yml" +DEFAULT_SETTING_PATH: Path = engine_root() / "default_setting.yaml" USER_SETTING_PATH: Path = get_save_dir() / "setting.yml"