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.

Sign up for GitHub

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

Jump to bottom

改行コードをLFに統一 #225

Merged
merged 3 commits into from
Dec 9, 2021
Merged

改行コードをLFに統一 #225

merged 3 commits into from
Dec 9, 2021

Conversation

takana-v
Copy link
Member

@takana-v takana-v commented Dec 7, 2021

内容

題の通り

関連 Issue

その他

#219 の差分を含んでいるのでそちらを先にお願いします。

@takana-v takana-v marked this pull request as draft December 7, 2021 09:51
@coveralls
Copy link

coveralls commented Dec 7, 2021 •
edited
Loading

Pull Request Test Coverage Report for Build 1551891035

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 84.441%
Totals Coverage Status
Change from base Build 1549787975: 0.0%
Covered Lines: 597
Relevant Lines: 707
💛 - Coveralls

@github-actions
Copy link

github-actions bot commented Dec 7, 2021 •
edited
Loading

Coverage Result

Resultを開く
Name Stmts Miss Cover
voicevox_engine/init.py 0 0 coverage-100%
voicevox_engine/acoustic_feature_extractor.py 85 0 coverage-100%
voicevox_engine/full_context_label.py 160 7 coverage-96%
voicevox_engine/kana_parser.py 75 1 coverage-99%
voicevox_engine/model.py 70 7 coverage-90%
voicevox_engine/mora_list.py 4 0 coverage-100%
voicevox_engine/preset/Preset.py 12 0 coverage-100%
voicevox_engine/preset/PresetLoader.py 34 1 coverage-97%
voicevox_engine/preset/init.py 3 0 coverage-100%
voicevox_engine/synthesis_engine/init.py 4 0 coverage-100%
voicevox_engine/synthesis_engine/forwarder.py 76 66 coverage-13%
voicevox_engine/synthesis_engine/make_synthesis_engine.py 23 18 coverage-22%
voicevox_engine/synthesis_engine/synthesis_engine.py 124 7 coverage-94%
voicevox_engine/utility/init.py 2 0 coverage-100%
voicevox_engine/utility/connect_base64_waves.py 35 3 coverage-91%
TOTAL 707 110 coverage-84%

@aoirint
Copy link
Member

aoirint commented Dec 7, 2021

まだDraftですが、*.inのほかに、

  • voicevox_engine/cancellable_engine.py
  • docs/api/index.html

もCRLFになっている気がしました！

（自動で見つける方法がほしいですが、.gitattributesでなんとかなるんでしょうか...?）

@qwerty2501
Copy link
Contributor

qwerty2501 commented Dec 7, 2021 •
edited
Loading

.gitattributesは作成以後の変更に影響を及ぼすようなので既存ファイルには変更を加えない限りは変わらないと思います
私としてはrequirements.txt系さえ統一されていれば良いのでこのPRで全てのファイルの改行を変更するかはお任せします。

@qwerty2501
Copy link
Contributor

#219 がmergeされたのに差分が出てておかしいなと思ったら #219 のmasterへのmergeはsquash mergeされてるようです

@takana-v
Copy link
Member Author

takana-v commented Dec 8, 2021

差分が出ないように修正しておきました。
.gitattributesも追加しています。

@takana-v takana-v changed the title 改行コードをLFに修正 改行コードをLFに統一 Dec 8, 2021
@takana-v takana-v marked this pull request as ready for review December 8, 2021 00:32
@qwerty2501
Copy link
Contributor

https://github.com/VOICEVOX/voicevox_engine/blob/master/requirements.txt も必要では？

@takana-v
Copy link
Member Author

takana-v commented Dec 8, 2021

こちらで確認した限りではrequirements.txtはLFだったので省いています。
（コメントし忘れていました...）

qwerty2501
qwerty2501 approved these changes Dec 8, 2021
View reviewed changes
Copy link
Contributor

@qwerty2501 qwerty2501 left a comment

Choose a reason for hiding this comment

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

grepで確認した結果、テキストファイルにはCRが含まれてないため大丈夫だと思います

> grep $'\r' -rl ./
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/3_003.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/5_003.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/5_002.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/7_001.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/3_002.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/1_001.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/7_003.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/3_001.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/5_001.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/1_002.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/1_003.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/voice_samples/7_002.wav
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/portrait.png
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/icons/5.png
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/icons/7.png
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/icons/3.png
./speaker_info/388f246b-8c41-4ac1-8e2d-5d79f3ff56d9/icons/1.png
./speaker_info/b1a81618-b27b-40d2-b0ea-27a9ad408c4b/voice_samples/9_002.wav
./speaker_info/b1a81618-b27b-40d2-b0ea-27a9ad408c4b/voice_samples/9_003.wav
./speaker_info/b1a81618-b27b-40d2-b0ea-27a9ad408c4b/voice_samples/9_001.wav
./speaker_info/b1a81618-b27b-40d2-b0ea-27a9ad408c4b/portrait.png
./speaker_info/b1a81618-b27b-40d2-b0ea-27a9ad408c4b/icons/9.png
./speaker_info/35b2c544-660e-401e-b503-0e14c635303a/voice_samples/8_001.wav
./speaker_info/35b2c544-660e-401e-b503-0e14c635303a/voice_samples/8_002.wav
./speaker_info/35b2c544-660e-401e-b503-0e14c635303a/voice_samples/8_003.wav
./speaker_info/35b2c544-660e-401e-b503-0e14c635303a/portrait.png
./speaker_info/35b2c544-660e-401e-b503-0e14c635303a/icons/8.png
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/0_003.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/4_003.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/6_001.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/4_002.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/0_001.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/2_003.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/2_001.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/6_002.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/4_001.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/0_002.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/6_003.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/voice_samples/2_002.wav
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/portrait.png
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/icons/2.png
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/icons/6.png
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/icons/4.png
./speaker_info/7ffcb7ce-00ec-4bdc-82cd-45a8889e43ff/icons/0.png
./.git/objects/pack/pack-f90f90184971e9e1515078f8d989b3e9902a32a5.pack
./.git/objects/pack/pack-f90f90184971e9e1515078f8d989b3e9902a32a5.idx
./.git/index

差分もきれいですね
https://github.com/VOICEVOX/voicevox_engine/pull/225/files?w=1

LGTM

Hiroshiba
Hiroshiba approved these changes Dec 8, 2021
View reviewed changes
Copy link
Member

@Hiroshiba Hiroshiba left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM！！

aoirint
aoirint approved these changes Dec 9, 2021
View reviewed changes
Copy link
Member

@aoirint aoirint left a comment

Choose a reason for hiding this comment

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

LGTM！

@aoirint aoirint merged commit 65d7ad2 into VOICEVOX:master Dec 9, 2021
@aoirint aoirint mentioned this pull request Dec 9, 2021
Closed
@takana-v takana-v deleted the fix-crlf branch December 9, 2021 22:19
@takana-v takana-v mentioned this pull request Dec 10, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aoirint aoirint aoirint approved these changes

@Hiroshiba Hiroshiba Hiroshiba approved these changes

@qwerty2501 qwerty2501 qwerty2501 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@takana-v @coveralls @aoirint @qwerty2501 @Hiroshiba