From 3f597a3b3093b7e36dedcb905872585e88f9a64e Mon Sep 17 00:00:00 2001 From: messense Date: Mon, 21 Nov 2022 23:00:14 +0800 Subject: [PATCH] Upgrade maturin to 0.14 (#846) --- .github/workflows/flake8-to-ruff.yaml | 8 -------- .github/workflows/ruff.yaml | 8 -------- flake8_to_ruff/pyproject.toml | 2 +- pyproject.toml | 3 +-- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/flake8-to-ruff.yaml b/.github/workflows/flake8-to-ruff.yaml index a3283dd3d6..ed4c913e51 100644 --- a/.github/workflows/flake8-to-ruff.yaml +++ b/.github/workflows/flake8-to-ruff.yaml @@ -34,7 +34,6 @@ jobs: with: target: x86_64 args: --release --out dist --sdist -m ./${{ env.CRATE_NAME }}/Cargo.toml - maturin-version: "v0.13.0" - name: Install built wheel - x86_64 run: | pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall @@ -61,7 +60,6 @@ jobs: uses: messense/maturin-action@v1 with: args: --release --universal2 --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml - maturin-version: "v0.13.0" - name: Install built wheel - universal2 run: | pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall @@ -93,7 +91,6 @@ jobs: with: target: ${{ matrix.target }} args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml - maturin-version: "v0.13.0" - name: Install built wheel shell: bash run: | @@ -121,7 +118,6 @@ jobs: target: ${{ matrix.target }} manylinux: auto args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml - maturin-version: "v0.13.0" - name: Install built wheel if: matrix.target == 'x86_64' run: | @@ -148,7 +144,6 @@ jobs: target: ${{ matrix.target }} manylinux: auto args: --no-default-features --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml - maturin-version: "v0.13.0" - uses: uraimo/run-on-arch-action@v2.0.5 if: matrix.target != 'ppc64' name: Install built wheel @@ -187,7 +182,6 @@ jobs: target: ${{ matrix.target }} manylinux: musllinux_1_2 args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml - maturin-version: "v0.13.0" - name: Install built wheel if: matrix.target == 'x86_64-unknown-linux-musl' uses: addnab/docker-run-action@v3 @@ -223,7 +217,6 @@ jobs: target: ${{ matrix.platform.target }} manylinux: musllinux_1_2 args: --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml - maturin-version: "v0.13.0" - uses: uraimo/run-on-arch-action@master name: Install built wheel with: @@ -261,7 +254,6 @@ jobs: - name: Build wheels uses: messense/maturin-action@v1 with: - maturin-version: "v0.13.0" target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i pypy${{ matrix.python-version }} -m ./${{ env.CRATE_NAME }}/Cargo.toml diff --git a/.github/workflows/ruff.yaml b/.github/workflows/ruff.yaml index 4eca9a1d0f..235a490776 100644 --- a/.github/workflows/ruff.yaml +++ b/.github/workflows/ruff.yaml @@ -36,7 +36,6 @@ jobs: with: target: x86_64 args: --release --out dist --sdist - maturin-version: "v0.13.0" - name: Install built wheel - x86_64 run: | pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall @@ -63,7 +62,6 @@ jobs: uses: messense/maturin-action@v1 with: args: --release --universal2 --out dist - maturin-version: "v0.13.0" - name: Install built wheel - universal2 run: | pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall @@ -95,7 +93,6 @@ jobs: with: target: ${{ matrix.target }} args: --release --out dist - maturin-version: "v0.13.0" - name: Install built wheel shell: bash run: | @@ -123,7 +120,6 @@ jobs: target: ${{ matrix.target }} manylinux: auto args: --release --out dist - maturin-version: "v0.13.0" - name: Install built wheel if: matrix.target == 'x86_64' run: | @@ -150,7 +146,6 @@ jobs: target: ${{ matrix.target }} manylinux: auto args: --no-default-features --release --out dist - maturin-version: "v0.13.0" - uses: uraimo/run-on-arch-action@v2.0.5 if: matrix.target != 'ppc64' name: Install built wheel @@ -189,7 +184,6 @@ jobs: target: ${{ matrix.target }} manylinux: musllinux_1_2 args: --release --out dist - maturin-version: "v0.13.0" - name: Install built wheel if: matrix.target == 'x86_64-unknown-linux-musl' uses: addnab/docker-run-action@v3 @@ -225,7 +219,6 @@ jobs: target: ${{ matrix.platform.target }} manylinux: musllinux_1_2 args: --release --out dist - maturin-version: "v0.13.0" - uses: uraimo/run-on-arch-action@master name: Install built wheel with: @@ -263,7 +256,6 @@ jobs: - name: Build wheels uses: messense/maturin-action@v1 with: - maturin-version: "v0.13.0" target: ${{ matrix.target }} manylinux: auto args: --release --out dist -i pypy${{ matrix.python-version }} diff --git a/flake8_to_ruff/pyproject.toml b/flake8_to_ruff/pyproject.toml index 786f4ec676..94d4ce5a39 100644 --- a/flake8_to_ruff/pyproject.toml +++ b/flake8_to_ruff/pyproject.toml @@ -25,7 +25,7 @@ requires-python = ">=3.7" repository = "https://github.com/charliermarsh/ruff#subdirectory=crates/flake8_to_ruff" [build-system] -requires = ["maturin>=0.13,<0.14"] +requires = ["maturin>=0.14,<0.15"] build-backend = "maturin" [tool.maturin] diff --git a/pyproject.toml b/pyproject.toml index ed43e4deaf..662e2209ae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,12 +25,11 @@ requires-python = ">=3.7" repository = "https://github.com/charliermarsh/ruff" [build-system] -requires = ["maturin>=0.13,<0.14"] +requires = ["maturin>=0.14,<0.15"] build-backend = "maturin" [tool.maturin] bindings = "bin" -sdist-include = ["Cargo.lock"] strip = true [tool.isort]