version取得APIを作った #260

qwerty2501 · 2022-08-29T17:12:32Z

内容

バージョン判別の需要がありそうだったのでこの際作ることにした
release build時にCargo.tomlにバージョン情報を埋め込むことで対応する

その他

python APIがmergeされてから本格的にreviewしたほうがよさそう

* Export more items in `voicevox_core` * Add `voicevox_core_python_api` * Add pyd files to .gitignore * Install Python 3.8 * Build only `voicevox_core_c_api` in `build-unix-cpp-example` * Add `build-python-api` job * Deny non-Unicode path for `open_jtalk_dict_dir` * Remove an unused dependency * Use pyo3-log again * Add `VoicevoxCore.is_gpu_mode` as a `@property` * Add example/pyo3/.gitignore * Add `help`s * Add example/pyo3/README.md * Insert an empty line * Use `@pydantic.dataclasses.dataclass` for `SupportedDevices` * Load `./*.dll` * Modify run.py * Do not allow `None` for `acceleration_mode` * Reorder methods * Move pyproject.toml * Move requirements.txt * Release whl * Leave the `package.version` of voicevox_core_python_api as is * Add crates/voicevox_core_python_api/README.md * Minor refactor * Improve "環境構築" * Fix a typo Co-authored-by: Nanashi. <[email protected]> * Fix a link * Add `voicevox_core_python_api/directml` feature * Update crates/voicevox_core_python_api/README.md * Add a comment * Remove /requirements.txt * `pass` → `...` * Type the return type of `VoicevoxCore.decode` * Minor refactor Co-authored-by: Nanashi. <[email protected]>

… feature/version_api

qwerty2501 · 2022-09-03T02:02:15Z

reviewできるようになりました

crates/voicevox_core_python_api/src/lib.rs

crates/voicevox_core_c_api/src/lib.rs

Co-authored-by: Hiroshiba <[email protected]>

qwerty2501 · 2022-09-03T04:58:56Z

versionを0.0.0にしました

… feature/version_api

Hiroshiba

LGTM！！

Hiroshiba · 2022-09-07T08:23:35Z

.github/workflows/build_and_deploy.yml

+        run: |
+          set-cargo-version ./crates/voicevox_core/Cargo.toml ${{ env.VERSION }}
+          set-cargo-version ./crates/voicevox_core_c_api/Cargo.toml ${{ env.VERSION }}
+          set-cargo-version ./crates/voicevox_core_python_api/Cargo.toml ${{ env.VERSION }}


将来増えたときに抜け漏れしそうだなとちょっとだけ思いました。
voiccevox_*/Cargo.tomlとかできるならこっちでも良いかも。

for cargo_toml in $( echo ./crate/voicevox_core_*/Cargo.toml ); do set-cargo-version $cargo_toml ${{ env.VERSION }} done

で出来なくはなさそう。

Suggested change

run: |

set-cargo-version ./crates/voicevox_core/Cargo.toml ${{ env.VERSION }}

set-cargo-version ./crates/voicevox_core_c_api/Cargo.toml ${{ env.VERSION }}

set-cargo-version ./crates/voicevox_core_python_api/Cargo.toml ${{ env.VERSION }}

shell: bash

run: |

cargo metadata --format-version 1 |

jq -r '.workspace_members as $members | .packages[] | select(.id as $id | $members | any(. == $id)) | .manifest_path' |

xargs -d '\n' -i{} -n 1 set-cargo-version {} "$VERSION"

ちゃんとやるんだったらこんな感じかな、とは思います。
(edit) 改行を入れました

./crate/voicevox_core*/Cargo.tomlでBash的に駄目な文字は出ないでしょうからnanashiさんのやつでもいいとは思いますが。

あまり複雑過ぎてもメンテできなくなりそうなので、nanashiさんの案をもとにつくりました

… feature/version_api

.github/workflows/build_and_deploy.yml

Co-authored-by: Ryo Yamashita <[email protected]>

qryxip

LGTM!

qwerty2501 force-pushed the feature/version_api branch from d85c369 to 3abd816 Compare August 29, 2022 17:13

version取得APIを作った

b04ffc9

qwerty2501 force-pushed the feature/version_api branch from 3abd816 to b04ffc9 Compare August 29, 2022 17:17

qwerty2501 mentioned this pull request Aug 30, 2022

PyO3を使ってクレートからwhlを作る #239

Merged

qryxip and others added 3 commits September 3, 2022 10:41

3つ分version設定するようにした

a5e4fa3

python apiにもget_versionを追加した

d414b97

qwerty2501 marked this pull request as ready for review September 3, 2022 01:42

Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…

a1393d6

… feature/version_api

qwerty2501 force-pushed the feature/version_api branch from 6e23780 to a1393d6 Compare September 3, 2022 01:46

c_api,python_apiもversionをmax値にした

7781eec

sevenc-nanashi reviewed Sep 3, 2022

View reviewed changes

crates/voicevox_core_python_api/src/lib.rs Outdated Show resolved Hide resolved

qryxip mentioned this pull request Sep 3, 2022

バージョンが二重管理になってしまっている #222

Closed

Hiroshiba reviewed Sep 3, 2022

View reviewed changes

crates/voicevox_core_c_api/src/lib.rs Outdated Show resolved Hide resolved

qwerty2501 and others added 2 commits September 3, 2022 13:53

versionを0.0.0に統一して、python apiのversionを__version__で取得されるようにした

3541b17

Update crates/voicevox_core_c_api/src/lib.rs

945167f

Co-authored-by: Hiroshiba <[email protected]>

Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…

166feb5

… feature/version_api

qwerty2501 temporarily deployed to false September 4, 2022 07:56 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 07:57 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 07:58 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 07:59 Inactive

CI build失敗していたのを修正した

7a38b4d

qwerty2501 temporarily deployed to false September 4, 2022 08:08 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 08:09 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 08:11 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 08:12 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 08:13 Inactive

qwerty2501 temporarily deployed to false September 4, 2022 08:14 Inactive

Hiroshiba approved these changes Sep 7, 2022

View reviewed changes

qwerty2501 added 2 commits September 7, 2022 23:18

全てのCargo.tomlに対してバージョンを設定できるようにした

50c0b40

Merge branch 'main' of https://github.com/VOICEVOX/voicevox_core into…

2893966

… feature/version_api

qwerty2501 temporarily deployed to false September 7, 2022 14:19 Inactive

qryxip reviewed Sep 7, 2022

View reviewed changes

.github/workflows/build_and_deploy.yml Show resolved Hide resolved

Update .github/workflows/build_and_deploy.yml

ea9f006

Co-authored-by: Ryo Yamashita <[email protected]>

qwerty2501 temporarily deployed to false September 7, 2022 17:40 Inactive

qwerty2501 temporarily deployed to false September 7, 2022 17:41 Inactive

qwerty2501 temporarily deployed to false September 7, 2022 17:42 Inactive

qryxip approved these changes Sep 8, 2022

View reviewed changes

Hiroshiba merged commit 266a50c into VOICEVOX:main Sep 8, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

version取得APIを作った #260

version取得APIを作った #260

qwerty2501 commented Aug 29, 2022 •

edited

Loading

qwerty2501 commented Sep 3, 2022

qwerty2501 commented Sep 3, 2022

Hiroshiba left a comment

Hiroshiba Sep 7, 2022

sevenc-nanashi Sep 7, 2022 •

edited

Loading

qryxip Sep 7, 2022 •

edited

Loading

qryxip Sep 7, 2022

qwerty2501 Sep 7, 2022

qryxip left a comment

-        run: |
-          set-cargo-version ./crates/voicevox_core/Cargo.toml ${{ env.VERSION }}
-          set-cargo-version ./crates/voicevox_core_c_api/Cargo.toml ${{ env.VERSION }}
-          set-cargo-version ./crates/voicevox_core_python_api/Cargo.toml ${{ env.VERSION }}
+        shell: bash
+        run: |
+          cargo metadata --format-version 1 |
+            jq -r '.workspace_members as $members | .packages[] | select(.id as $id | $members | any(. == $id)) | .manifest_path' |
+            xargs -d '\n' -i{} -n 1 set-cargo-version {} "$VERSION"

version取得APIを作った #260

version取得APIを作った #260

Conversation

qwerty2501 commented Aug 29, 2022 • edited Loading

内容

関連 Issue

その他

qwerty2501 commented Sep 3, 2022

qwerty2501 commented Sep 3, 2022

Hiroshiba left a comment

Choose a reason for hiding this comment

Hiroshiba Sep 7, 2022

Choose a reason for hiding this comment

sevenc-nanashi Sep 7, 2022 • edited Loading

Choose a reason for hiding this comment

qryxip Sep 7, 2022 • edited Loading

Choose a reason for hiding this comment

qryxip Sep 7, 2022

Choose a reason for hiding this comment

qwerty2501 Sep 7, 2022

Choose a reason for hiding this comment

qryxip left a comment

Choose a reason for hiding this comment

qwerty2501 commented Aug 29, 2022 •

edited

Loading

sevenc-nanashi Sep 7, 2022 •

edited

Loading

qryxip Sep 7, 2022 •

edited

Loading