From e3a6a01d18d8b22d3303c4e7c08ac7cd081560cd Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Wed, 1 Nov 2023 20:39:39 +0900 Subject: [PATCH 01/20] Create CI.yml --- .github/workflows/CI.yml | 122 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 .github/workflows/CI.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 000000000..294d7fe6f --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,122 @@ +# This file is autogenerated by maturin v1.3.1 +# To update, run +# +# maturin generate-ci github +# +name: CI + +on: + push: + branches: + - main + - master + tags: + - '*' + pull_request: + workflow_dispatch: + +permissions: + contents: read + +jobs: + linux: + runs-on: ubuntu-latest + strategy: + matrix: + target: [x86_64, aarch64] + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml + sccache: 'true' + manylinux: auto + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + + windows: + runs-on: windows-latest + strategy: + matrix: + target: [x64, x86] + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + architecture: ${{ matrix.target }} + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml + sccache: 'true' + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + + macos: + runs-on: macos-latest + strategy: + matrix: + target: [x86_64] + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + - uses: dtolnay/rust-toolchain@stable + - run: cargo build -p voicevox_core_python_api + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml + sccache: 'true' + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + + sdist: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Build sdist + uses: PyO3/maturin-action@v1 + with: + command: sdist + args: --out dist --manifest-path crates/voicevox_core_python_api/Cargo.toml + - name: Upload sdist + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist + + release: + name: Release + runs-on: ubuntu-latest + if: "startsWith(github.ref, 'refs/tags/')" + needs: [linux, windows, macos, sdist] + steps: + - uses: actions/download-artifact@v3 + with: + name: wheels + - name: Publish to PyPI + uses: PyO3/maturin-action@v1 + env: + MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} + with: + command: upload + args: --non-interactive --skip-existing * From 670fa97108c6aefe846aa10cbb2d417a78aeaddf Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 00:02:26 +0900 Subject: [PATCH 02/20] Update CI.yml --- .github/workflows/CI.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 294d7fe6f..0818b138d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -76,7 +76,11 @@ jobs: with: python-version: '3.10' - uses: dtolnay/rust-toolchain@stable - - run: cargo build -p voicevox_core_python_api + - run: | + pip install --upgrade poetry + poetry config virtualenvs.create false + (cd crates/voicevox_core_python_api && poetry install --with dev) + cargo build -p voicevox_core_python_api - name: Build wheels uses: PyO3/maturin-action@v1 with: From 73b949d8b4d902fed8a5ceb659421d85f4482e61 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 00:12:17 +0900 Subject: [PATCH 03/20] Update CI.yml --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0818b138d..092d7cee8 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -80,7 +80,6 @@ jobs: pip install --upgrade poetry poetry config virtualenvs.create false (cd crates/voicevox_core_python_api && poetry install --with dev) - cargo build -p voicevox_core_python_api - name: Build wheels uses: PyO3/maturin-action@v1 with: From f1998acba860f7a4ca180e40c39431efba40c205 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 00:25:21 +0900 Subject: [PATCH 04/20] =?UTF-8?q?=E5=8B=9D=E5=88=A9=E5=AE=A3=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI.yml | 50 +++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 092d7cee8..7e5fdbd48 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,26 +6,48 @@ name: CI on: - push: - branches: - - main - - master - tags: - - '*' - pull_request: workflow_dispatch: + inputs: + version: + description: "バージョン情報（A.BB.C / A.BB.C-preview.D）" + required: true + release: + types: + - published + +env: + VERSION: ${{ github.event.release.tag_name || inputs.version || '0.0.0' permissions: contents: read jobs: + download: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Install cargo-binstall + uses: taiki-e/install-action@cargo-binstall + - name: Install cargo-edit + run: cargo binstall cargo-edit@^0.11 --no-confirm --log-level debug + - name: set cargo version + run: | + cargo set-version "$VERSION" --exclude voicevox_core_python_api --exclude downloader --exclude xtask + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: projects + path: ./ + linux: runs-on: ubuntu-latest strategy: matrix: target: [x86_64, aarch64] steps: - - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: projects - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -48,7 +70,9 @@ jobs: matrix: target: [x64, x86] steps: - - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: projects - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -71,7 +95,9 @@ jobs: matrix: target: [x86_64] steps: - - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: projects - uses: actions/setup-python@v4 with: python-version: '3.10' @@ -95,7 +121,9 @@ jobs: sdist: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/download-artifact@v3 + with: + name: projects - name: Build sdist uses: PyO3/maturin-action@v1 with: From 6c3042a9685ad0a9721f43baa02ed6a55345e351 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 00:26:56 +0900 Subject: [PATCH 05/20] Update CI.yml --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7e5fdbd48..1ae57f152 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -16,7 +16,7 @@ on: - published env: - VERSION: ${{ github.event.release.tag_name || inputs.version || '0.0.0' + VERSION: ${{ github.event.release.tag_name || inputs.version || '0.0.0' }} permissions: contents: read From ee0180f4f4bc48c827af5a534f646bf0d685abfc Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 00:31:07 +0900 Subject: [PATCH 06/20] Update CI.yml --- .github/workflows/CI.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1ae57f152..c5381a964 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -22,7 +22,7 @@ permissions: contents: read jobs: - download: + version: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -41,6 +41,7 @@ jobs: linux: runs-on: ubuntu-latest + needs: version strategy: matrix: target: [x86_64, aarch64] @@ -66,6 +67,7 @@ jobs: windows: runs-on: windows-latest + needs: version strategy: matrix: target: [x64, x86] @@ -91,6 +93,7 @@ jobs: macos: runs-on: macos-latest + needs: version strategy: matrix: target: [x86_64] From f632406ed9189cccfd909b488e5aff905fca7b87 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 00:33:09 +0900 Subject: [PATCH 07/20] Update CI.yml --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c5381a964..608747302 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -123,6 +123,7 @@ jobs: sdist: runs-on: ubuntu-latest + needs: version steps: - uses: actions/download-artifact@v3 with: From b9dc52d281a2ac0bd84f2d9121f38c5e94ab410f Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 00:48:58 +0900 Subject: [PATCH 08/20] Update CI.yml --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 608747302..137b96616 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -56,7 +56,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.target }} - args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml + args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml --find-interpreter sccache: 'true' manylinux: auto - name: Upload wheels @@ -83,7 +83,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.target }} - args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml + args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml --find-interpreter sccache: 'true' - name: Upload wheels uses: actions/upload-artifact@v3 @@ -113,7 +113,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.target }} - args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml + args: --release --out dist --locked --manifest-path crates/voicevox_core_python_api/Cargo.toml --find-interpreter sccache: 'true' - name: Upload wheels uses: actions/upload-artifact@v3 From 0c5bf40276b58a8b0a3474d8f346aa3a0a6f20ac Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 02:14:24 +0900 Subject: [PATCH 09/20] Update CI.yml --- .github/workflows/CI.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 137b96616..2c2ff494b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -144,14 +144,11 @@ jobs: runs-on: ubuntu-latest if: "startsWith(github.ref, 'refs/tags/')" needs: [linux, windows, macos, sdist] + permissions: + id-token: write steps: - uses: actions/download-artifact@v3 with: name: wheels - name: Publish to PyPI - uses: PyO3/maturin-action@v1 - env: - MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }} - with: - command: upload - args: --non-interactive --skip-existing * + uses: pypa/gh-action-pypi-publish@release/v1 From c4adad104632eae5871a1e8eaf4aaea5899d458d Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 02:29:46 +0900 Subject: [PATCH 10/20] Update CI.yml --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2c2ff494b..64830e5bc 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -152,3 +152,5 @@ jobs: name: wheels - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository-url: https://test.pypi.org/legacy/ From e09ed7a08213ab158413c8dc9c1393f401b2e8ba Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 02:45:42 +0900 Subject: [PATCH 11/20] Update CI.yml --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 64830e5bc..8305e7d46 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -150,6 +150,7 @@ jobs: - uses: actions/download-artifact@v3 with: name: wheels + path: dist/ - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: From 8eb71d92ba97269602c1f172b36fdf37fbc7ed97 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 03:11:18 +0900 Subject: [PATCH 12/20] Update pyproject.toml --- crates/voicevox_core_python_api/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/voicevox_core_python_api/pyproject.toml b/crates/voicevox_core_python_api/pyproject.toml index 3164bc528..c80856f37 100644 --- a/crates/voicevox_core_python_api/pyproject.toml +++ b/crates/voicevox_core_python_api/pyproject.toml @@ -1,5 +1,5 @@ [project] -name = "voicevox_core" +name = "voicevox" requires-python = ">=3.8" dependencies = ["pydantic>=1.9.2,<2"] description = "VOICEVOX CORE の Python バインディングです。" From 4d37b05b724a2d87391dd75a1a06a8c1e4509cd5 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 03:32:36 +0900 Subject: [PATCH 13/20] Update CI.yml --- .github/workflows/CI.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8305e7d46..c05393551 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -152,6 +152,7 @@ jobs: name: wheels path: dist/ - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + uses: PyO3/maturin-action@v1 with: - repository-url: https://test.pypi.org/legacy/ + command: upload + args: --non-interactive --skip-existing dist/* From 1b330505381570f3f28f6de2ccf7cf1142fd470e Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 07:50:50 +0900 Subject: [PATCH 14/20] Update CI.yml --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c05393551..22e8a8b9b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -156,3 +156,5 @@ jobs: with: command: upload args: --non-interactive --skip-existing dist/* + env: + MATURIN_REPOSITORY_URL: https://test.pypi.org/legacy/ From 9e4bd97523f898960d8ce0f441e3c5c496e5310e Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 13:29:35 +0900 Subject: [PATCH 15/20] Remove abi3 --- crates/voicevox_core_python_api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/voicevox_core_python_api/Cargo.toml b/crates/voicevox_core_python_api/Cargo.toml index aa40062ed..3daaee982 100644 --- a/crates/voicevox_core_python_api/Cargo.toml +++ b/crates/voicevox_core_python_api/Cargo.toml @@ -13,7 +13,7 @@ directml = ["voicevox_core/directml"] [dependencies] easy-ext.workspace = true log.workspace = true -pyo3 = { workspace = true, features = ["abi3-py38", "extension-module"] } +pyo3 = { workspace = true, features = "extension-module"] } pyo3-asyncio = { workspace = true, features = ["tokio-runtime"] } pyo3-log.workspace = true serde = { workspace = true, features = ["derive"] } From db0a738ee8dda3336bfe0414d5aac0a0fa0c4c42 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 13:31:39 +0900 Subject: [PATCH 16/20] Remove sdist --- .github/workflows/CI.yml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 22e8a8b9b..84e512d80 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -121,29 +121,11 @@ jobs: name: wheels path: dist - sdist: - runs-on: ubuntu-latest - needs: version - steps: - - uses: actions/download-artifact@v3 - with: - name: projects - - name: Build sdist - uses: PyO3/maturin-action@v1 - with: - command: sdist - args: --out dist --manifest-path crates/voicevox_core_python_api/Cargo.toml - - name: Upload sdist - uses: actions/upload-artifact@v3 - with: - name: wheels - path: dist - release: name: Release runs-on: ubuntu-latest if: "startsWith(github.ref, 'refs/tags/')" - needs: [linux, windows, macos, sdist] + needs: [linux, windows, macos] permissions: id-token: write steps: From d62c18e27d18299b918f65b10989abd1e36160bb Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Fri, 24 Nov 2023 13:34:39 +0900 Subject: [PATCH 17/20] Update Cargo.toml --- crates/voicevox_core_python_api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/voicevox_core_python_api/Cargo.toml b/crates/voicevox_core_python_api/Cargo.toml index 3daaee982..8e494173d 100644 --- a/crates/voicevox_core_python_api/Cargo.toml +++ b/crates/voicevox_core_python_api/Cargo.toml @@ -13,7 +13,7 @@ directml = ["voicevox_core/directml"] [dependencies] easy-ext.workspace = true log.workspace = true -pyo3 = { workspace = true, features = "extension-module"] } +pyo3 = { workspace = true, features = ["extension-module"] } pyo3-asyncio = { workspace = true, features = ["tokio-runtime"] } pyo3-log.workspace = true serde = { workspace = true, features = ["derive"] } From 889664de808293a62c60d47b9ad818da0434f00d Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Sat, 25 Nov 2023 11:55:25 +0900 Subject: [PATCH 18/20] manylinuxwo --- crates/voicevox_core_python_api/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/voicevox_core_python_api/pyproject.toml b/crates/voicevox_core_python_api/pyproject.toml index 3164bc528..f08eabcf6 100644 --- a/crates/voicevox_core_python_api/pyproject.toml +++ b/crates/voicevox_core_python_api/pyproject.toml @@ -25,7 +25,7 @@ profile = "black" [tool.maturin] module-name = "voicevox_core._rust" bindings = "pyo3" -skip-auditwheel = true # Linuxでlibonnxruntime.so.*の不在を許してもらう +skip-auditwheel = false # Linuxでlibonnxruntime.so.*の不在を許してもらう python-source = "python" [tool.poetry] From 76f54d5bb83e329b78dc5dfb47bd3c5b920f9a96 Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Tue, 28 Nov 2023 15:51:48 +0000 Subject: [PATCH 19/20] =?UTF-8?q?pathcelf=E6=9C=89=E5=8A=B9=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=BF=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/voicevox_core_python_api/poetry.lock | 52 +++++++++++++------ .../voicevox_core_python_api/pyproject.toml | 2 +- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/crates/voicevox_core_python_api/poetry.lock b/crates/voicevox_core_python_api/poetry.lock index 0a78abec8..5b51b9888 100644 --- a/crates/voicevox_core_python_api/poetry.lock +++ b/crates/voicevox_core_python_api/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "accessible-pygments" @@ -465,27 +465,28 @@ files = [ [[package]] name = "maturin" -version = "1.3.1" +version = "1.3.2" description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages" optional = false python-versions = ">=3.7" files = [ - {file = "maturin-1.3.1-py3-none-linux_armv6l.whl", hash = "sha256:925f8324d9bbe8fad90b73ebc6c7f6f594645e7f13af50bded72606b6c233208"}, - {file = "maturin-1.3.1-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:f3c2c694b76e63e78c353e4a2a74f8baff5ac6becf807f23435d28e47a567d63"}, - {file = "maturin-1.3.1-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:13188296f389d05043b8bd2265df66692490b61ba219ae7d5abc09e81e5659ce"}, - {file = "maturin-1.3.1-py3-none-manylinux_2_12_i686.manylinux2010_i686.musllinux_1_1_i686.whl", hash = "sha256:11bbf9978695ac066729af08bc24123317ca3fad51757b0fbdfe811212896714"}, - {file = "maturin-1.3.1-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl", hash = "sha256:d566d2f424fa3f5cd6bd3033fd300b80654884abd061bd53c68f4717753e7d58"}, - {file = "maturin-1.3.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:c0e2b8171f1a70270b86ed72397ba548e3bf4d914f24cd50a228ed85a9d5e914"}, - {file = "maturin-1.3.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl", hash = "sha256:804c6706588a9ca78f18f1a10adf9d24099b9cd3c2917628063ba8d4418b8a50"}, - {file = "maturin-1.3.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.musllinux_1_1_ppc64le.whl", hash = "sha256:c533d02563bb185125488cdcf161cc6ba2cdd4812ebff1b6504d1b29880ba1f8"}, - {file = "maturin-1.3.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:066b0c515505d4a4c526a9afc26fad4f010972d60937530dc4949dda0f49aa61"}, - {file = "maturin-1.3.1-py3-none-win32.whl", hash = "sha256:4835c332e3b632547db12e6a70abc18cb90ba9df06200dd9a7cc73424919901d"}, - {file = "maturin-1.3.1-py3-none-win_amd64.whl", hash = "sha256:871268417d6b3e2b46018c54a0522efc018bc4918b885d005df90b338e0674c7"}, - {file = "maturin-1.3.1-py3-none-win_arm64.whl", hash = "sha256:659a601c27984a50350f792447ff65ec60309423747f5304c98cb7b7fbb63d39"}, - {file = "maturin-1.3.1.tar.gz", hash = "sha256:efa194e99ae5fff185263d8244acacb12ae256ea73aba62c9446f6075ffc7ac1"}, + {file = "maturin-1.3.2-py3-none-linux_armv6l.whl", hash = "sha256:34630f6a6223e36198b6039e40724fe27f6465ea892531ac82eeff604cfcbbb0"}, + {file = "maturin-1.3.2-py3-none-macosx_10_7_x86_64.whl", hash = "sha256:61b9dc290663040df4c837aa9e1858d485aaf90a10ec31b822f1d92a85334e2c"}, + {file = "maturin-1.3.2-py3-none-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5a133d22fa1ad4b687f6a89801cd7a9247164270c2ae639d1b7f53f0701601ab"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_12_i686.manylinux2010_i686.musllinux_1_1_i686.whl", hash = "sha256:1258d380498924626cd87820ff54eeb16b662799ddda10631f54fdfbab780d6a"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_12_x86_64.manylinux2010_x86_64.musllinux_1_1_x86_64.whl", hash = "sha256:8c90336c9bb0cb538bb035f9e5728ab59148c87bb8e76df26359560f8580fef4"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:d4b66635e3933709a67760e886931b087089e484e441b1b6be358da474947cea"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl", hash = "sha256:4b9cc75d7912b1c0512d4ea9dd66b8b401cbc11c69e32a23215b10a9f2bccdf4"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.musllinux_1_1_ppc64le.whl", hash = "sha256:b0b408fb55a7ce037562c44321ab40e2cee0f670b335de44b3b39c2334a0aea1"}, + {file = "maturin-1.3.2-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a469deffd61dc36ceafa0a74a437f39556c4f3c909d2eeb221b2ef2ca594469f"}, + {file = "maturin-1.3.2-py3-none-win32.whl", hash = "sha256:b67c51d5330d73da03726a4579c56404dc300603709e3f6e8945cc6e3550f885"}, + {file = "maturin-1.3.2-py3-none-win_amd64.whl", hash = "sha256:84d5587d2c0168d6cce0bcf720e62f2b7c87f2a9a9f749bcc7b86bc088a32c93"}, + {file = "maturin-1.3.2-py3-none-win_arm64.whl", hash = "sha256:ff0023a21df192a736726ad9fe55fb083f153d6287832d0add4861dfb35a8e83"}, + {file = "maturin-1.3.2.tar.gz", hash = "sha256:952d458b3dea01e9670582ac2dff3c522a34e491f08ed6376b270655a68c24af"}, ] [package.dependencies] +patchelf = {version = "*", optional = true, markers = "extra == \"patchelf\""} tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [package.extras] @@ -514,6 +515,25 @@ files = [ {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, ] +[[package]] +name = "patchelf" +version = "0.17.2.1" +description = "A small utility to modify the dynamic linker and RPATH of ELF executables." +optional = false +python-versions = "*" +files = [ + {file = "patchelf-0.17.2.1-py2.py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:fc329da0e8f628bd836dfb8eaf523547e342351fa8f739bf2b3fe4a6db5a297c"}, + {file = "patchelf-0.17.2.1-py2.py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.musllinux_1_1_armv7l.whl", hash = "sha256:ccb266a94edf016efe80151172c26cff8c2ec120a57a1665d257b0442784195d"}, + {file = "patchelf-0.17.2.1-py2.py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.musllinux_1_1_ppc64le.whl", hash = "sha256:f47b5bdd6885cfb20abdd14c707d26eb6f499a7f52e911865548d4aa43385502"}, + {file = "patchelf-0.17.2.1-py2.py3-none-manylinux_2_17_s390x.manylinux2014_s390x.musllinux_1_1_s390x.whl", hash = "sha256:a9e6ebb0874a11f7ed56d2380bfaa95f00612b23b15f896583da30c2059fcfa8"}, + {file = "patchelf-0.17.2.1-py2.py3-none-manylinux_2_5_i686.manylinux1_i686.musllinux_1_1_i686.whl", hash = "sha256:3c8d58f0e4c1929b1c7c45ba8da5a84a8f1aa6a82a46e1cfb2e44a4d40f350e5"}, + {file = "patchelf-0.17.2.1-py2.py3-none-manylinux_2_5_x86_64.manylinux1_x86_64.musllinux_1_1_x86_64.whl", hash = "sha256:d1a9bc0d4fd80c038523ebdc451a1cce75237cfcc52dbd1aca224578001d5927"}, + {file = "patchelf-0.17.2.1.tar.gz", hash = "sha256:a6eb0dd452ce4127d0d5e1eb26515e39186fa609364274bc1b0b77539cfa7031"}, +] + +[package.extras] +test = ["importlib-metadata", "pytest"] + [[package]] name = "pathspec" version = "0.11.2" @@ -1090,4 +1110,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.13" -content-hash = "42faee9d02ea5ad43eaef485f2127f0ffd77a5f8951ef71529eb1e85249e9c04" +content-hash = "48460c7058c12c92329d903cd128a99741195bc0688b920b3b31ed8466431622" diff --git a/crates/voicevox_core_python_api/pyproject.toml b/crates/voicevox_core_python_api/pyproject.toml index 5ad0bd6d8..ffe207845 100644 --- a/crates/voicevox_core_python_api/pyproject.toml +++ b/crates/voicevox_core_python_api/pyproject.toml @@ -45,7 +45,7 @@ pydata-sphinx-theme = "0.14.1" sphinx-autoapi = "3.0.0" [tool.poetry.group.dev.dependencies] -maturin = "1.3.1" +maturin = {extras = ["patchelf"], version = "^1.3.2"} [tool.poetry.group.test.dependencies] pytest = "7.3.1" From 4d037576adcddaa379266e55718189bb084bcbfe Mon Sep 17 00:00:00 2001 From: mc_fdc Date: Tue, 26 Dec 2023 17:03:02 +0000 Subject: [PATCH 20/20] =?UTF-8?q?fix:=20linux=E3=81=AE=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E3=83=93=E3=83=AB=E3=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/voicevox_core_python_api/poetry.lock | 3 +-- crates/voicevox_core_python_api/pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/voicevox_core_python_api/poetry.lock b/crates/voicevox_core_python_api/poetry.lock index 5b51b9888..fb112ad87 100644 --- a/crates/voicevox_core_python_api/poetry.lock +++ b/crates/voicevox_core_python_api/poetry.lock @@ -486,7 +486,6 @@ files = [ ] [package.dependencies] -patchelf = {version = "*", optional = true, markers = "extra == \"patchelf\""} tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [package.extras] @@ -1110,4 +1109,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.13" -content-hash = "48460c7058c12c92329d903cd128a99741195bc0688b920b3b31ed8466431622" +content-hash = "39c905ee1d976c1ad0f898674b8212041bfbdf31e2d88a7f274e2c971f91d230" diff --git a/crates/voicevox_core_python_api/pyproject.toml b/crates/voicevox_core_python_api/pyproject.toml index d28157d30..de1b523b6 100644 --- a/crates/voicevox_core_python_api/pyproject.toml +++ b/crates/voicevox_core_python_api/pyproject.toml @@ -45,7 +45,8 @@ pydata-sphinx-theme = "0.14.1" sphinx-autoapi = "3.0.0" [tool.poetry.group.dev.dependencies] -maturin = {extras = ["patchelf"], version = "^1.3.2"} +maturin = "^1.3.2" +patchelf = {version = "^0.17.2.1", platform = "linux"} [tool.poetry.group.test.dependencies] pytest = "7.3.1"