Maturinをv1.3.1に

VOICEVOX · Oct 27, 2023 · 61730d8 · 61730d8
1 parent d252b81
commit 61730d8
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 22 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -278,6 +278,11 @@ jobs:
           poetry config virtualenvs.create false
           (cd crates/voicevox_core_python_api && poetry install --with dev)
           function build() {
+            # shellcheck disable=SC2251
+            ! grep -q dev-dependencies ./crates/voicevox_core_python_api/Cargo.toml
+            # 以下のようなことを防止するため、依存クレートはMaturinの外でビルドしておく
+            # https://github.com/VOICEVOX/voicevox_core/issues/653#issuecomment-1782108410
+            cargo build -p voicevox_core_python_api --features ${{ matrix.features }}, --target ${{ matrix.target }} --release -vv
             maturin build --manifest-path ./crates/voicevox_core_python_api/Cargo.toml --features ${{ matrix.features }}, --target ${{ matrix.target }} --release
           }
           if ${{ !inputs.is_production }}; then

diff --git a/.github/workflows/generate_document.yml b/.github/workflows/generate_document.yml
@@ -47,7 +47,9 @@ jobs:
           working-directory: "docs/apis/c_api/doxygen"
       - name: Build voicevox_core_python_api
         run: |
-          cargo build -p voicevox_core_c_api -vv
+          # 以下のようなことを防止するため、依存クレートはMaturinの外でビルドしておく
+          # https://github.com/VOICEVOX/voicevox_core/issues/653#issuecomment-1782108410
+          cargo build -p voicevox_core_python_api -vv
           maturin develop --manifest-path ./crates/voicevox_core_python_api/Cargo.toml --locked
       - name: Generate Sphinx document
         run: sphinx-build docs/apis/python_api public/apis/python_api

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -275,6 +275,9 @@ jobs:
           pip install --upgrade poetry
           poetry install --with dev --with test
       - run: cargo build -p test_util -vv # build scriptにより/crates/test_util/data/の生成
+      # 以下のようなことを防止するため、依存クレートはMaturinの外でビルドしておく
+      # https://github.com/VOICEVOX/voicevox_core/issues/653#issuecomment-1782108410
+      - run: poetry run -- cargo build -p voicevox_core_python_api -vv
       - run: poetry run maturin build --locked
       - run: poetry run maturin develop --locked
       - name: 必要なDLLをコピーしてpytestを実行

diff --git a/crates/voicevox_core_python_api/Cargo.toml b/crates/voicevox_core_python_api/Cargo.toml
@@ -4,10 +4,6 @@ version = "0.0.0"
 edition.workspace = true
 publish.workspace = true
 
-[package.metadata.maturin]
-name = "voicevox_core._rust"
-python-source = "python"
-
 [lib]
 crate-type = ["cdylib"]
 

diff --git a/crates/voicevox_core_python_api/poetry.lock b/crates/voicevox_core_python_api/poetry.lock
diff --git a/crates/voicevox_core_python_api/pyproject.toml b/crates/voicevox_core_python_api/pyproject.toml
@@ -16,15 +16,17 @@ classifiers = [
 # readme = "README.md"
 
 [build-system]
-requires = ["maturin>=0.13.2,<0.14"]
+requires = ["maturin>=1.3.1,<2"]
 build-backend = "maturin"
 
 [tool.isort]
 profile = "black"
 
 [tool.maturin]
+module-name = "voicevox_core._rust"
 bindings = "pyo3"
 skip-auditwheel = true # Linuxでlibonnxruntime.so.*の不在を許してもらう
+python-source = "python"
 
 [tool.poetry]
 # Poetryはこれがないと動かない
@@ -43,7 +45,7 @@ pydata-sphinx-theme = "0.14.1"
 sphinx-autoapi = "3.0.0"
 
 [tool.poetry.group.dev.dependencies]
-maturin = "0.13.7"
+maturin = "1.3.1"
 
 [tool.poetry.group.test.dependencies]
 pytest = "7.3.1"