Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

poetry.lock: content-hashを再生成 #768

Merged
merged 1 commit into from
Oct 17, 2023

Conversation

aoirint
Copy link
Member

@aoirint aoirint commented Oct 17, 2023

内容

#766#767 でそれぞれライブラリを変更したため、コンフリクト解消時にpoetry.lockcontent-hashをコマンドで再生成する必要があったみたいです。
content-hashの値がpyproject.tomlから計算されるものと異なるため、poetry install時に以下の警告が出ます(警告が出るだけで、ライブラリインストールはできます)。

$ poetry install
Installing dependencies from lock file
Warning: poetry.lock is not consistent with pyproject.toml. You may be getting improper dependencies. Run `poetry lock [--no-update]` to fix it.

このPRでは、 #766#767 の変更を両方適用した状態で poetry lock --no-update を実行して、 content-hashを再生成しました。

もしこのPRがマージされるまでに(43cba4c 以降に)別途ライブラリを変更するPRがマージされ、content-hashが更新された場合、Closeしてください(ライブラリが変更されれば勝手に解消されます)。

関連 Issue

スクリーンショット・動画など

その他

@aoirint aoirint requested a review from a team as a code owner October 17, 2023 11:00
@aoirint aoirint requested review from y-chan and removed request for a team October 17, 2023 11:00
@github-actions
Copy link

Coverage Result

Resultを開く
Name Stmts Miss Cover
run.py 453 305 coverage-33%
voicevox_engine/init.py 1 0 coverage-100%
voicevox_engine/acoustic_feature_extractor.py 75 0 coverage-100%
voicevox_engine/cancellable_engine.py 91 71 coverage-22%
voicevox_engine/dev/core/init.py 2 0 coverage-100%
voicevox_engine/dev/core/mock.py 27 12 coverage-56%
voicevox_engine/dev/synthesis_engine/init.py 2 0 coverage-100%
voicevox_engine/dev/synthesis_engine/mock.py 36 2 coverage-94%
voicevox_engine/downloadable_library.py 93 5 coverage-95%
voicevox_engine/engine_manifest/EngineManifest.py 34 0 coverage-100%
voicevox_engine/engine_manifest/EngineManifestLoader.py 12 0 coverage-100%
voicevox_engine/engine_manifest/init.py 3 0 coverage-100%
voicevox_engine/full_context_label.py 162 3 coverage-98%
voicevox_engine/kana_parser.py 86 1 coverage-99%
voicevox_engine/metas/Metas.py 33 0 coverage-100%
voicevox_engine/metas/MetasStore.py 29 12 coverage-59%
voicevox_engine/metas/init.py 2 0 coverage-100%
voicevox_engine/model.py 160 9 coverage-94%
voicevox_engine/mora_list.py 4 0 coverage-100%
voicevox_engine/morphing.py 70 46 coverage-34%
voicevox_engine/part_of_speech_data.py 5 0 coverage-100%
voicevox_engine/preset/Preset.py 12 0 coverage-100%
voicevox_engine/preset/PresetError.py 2 0 coverage-100%
voicevox_engine/preset/PresetManager.py 81 2 coverage-98%
voicevox_engine/preset/init.py 4 0 coverage-100%
voicevox_engine/setting/Setting.py 11 0 coverage-100%
voicevox_engine/setting/SettingLoader.py 19 0 coverage-100%
voicevox_engine/setting/init.py 3 0 coverage-100%
voicevox_engine/synthesis_engine/init.py 5 0 coverage-100%
voicevox_engine/synthesis_engine/core_wrapper.py 201 146 coverage-27%
voicevox_engine/synthesis_engine/make_synthesis_engines.py 59 30 coverage-49%
voicevox_engine/synthesis_engine/synthesis_engine.py 130 11 coverage-92%
voicevox_engine/synthesis_engine/synthesis_engine_base.py 67 9 coverage-87%
voicevox_engine/user_dict.py 144 11 coverage-92%
voicevox_engine/utility/init.py 5 0 coverage-100%
voicevox_engine/utility/connect_base64_waves.py 37 0 coverage-100%
voicevox_engine/utility/core_version_utility.py 8 1 coverage-88%
voicevox_engine/utility/mutex_utility.py 10 0 coverage-100%
voicevox_engine/utility/path_utility.py 26 8 coverage-69%
TOTAL 2204 684 coverage-69%

Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!!

おっと!
なんか適当に生成されるハッシュ値だと思っていたのですが、ちゃんと意味のある値だったんですね!!
失礼しました、ありがとうございます!!

@Hiroshiba Hiroshiba merged commit 94ef095 into VOICEVOX:master Oct 17, 2023
3 checks passed
@Hiroshiba Hiroshiba removed the request for review from y-chan October 17, 2023 11:48
@aoirint aoirint deleted the patch-regenerate-content-hash branch October 17, 2023 12:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants