diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96fa58a3..cf5fe7c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: workflow_dispatch env: - MATURIN_VERSION: 1.3.2 + MATURIN_VERSION: 1.5.1 PY_ALL: 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10 jobs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5edd4719..5d3fdad9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,7 +7,7 @@ on: - master env: - MATURIN_VERSION: 1.3.2 + MATURIN_VERSION: 1.5.1 PYTHON_VERSION: 3.12 jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5ebf184b..c5312d90 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: # types: [published] env: - MATURIN_VERSION: 1.3.2 + MATURIN_VERSION: 1.5.1 PY_ALL: 3.8 3.9 3.10 3.11 3.12 pypy3.8 pypy3.9 pypy3.10 jobs: @@ -126,9 +126,6 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: components: llvm-tools - - run: | - RUST_HOST=$(rustc -Vv | grep host | cut -d ' ' -f 2) rustup run stable bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/$RUST_HOST/bin/llvm-profdata >> "$GITHUB_ENV"' - shell: bash - name: Build initial wheel uses: PyO3/maturin-action@v1 with: @@ -139,6 +136,9 @@ jobs: manylinux: ${{ matrix.manylinux || 'auto' }} env: RUSTFLAGS: "-Cprofile-generate=${{ github.workspace }}/profdata" + - run: | + RUST_HOST=$(rustc -Vv | grep host | cut -d ' ' -f 2) rustup run stable bash -c 'echo LLVM_PROFDATA=$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/$RUST_HOST/bin/llvm-profdata >> "$GITHUB_ENV"' + shell: bash - name: Generate PGO data shell: bash run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef2e9d34..ce7028ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ on: - master env: - MATURIN_VERSION: 1.3.2 + MATURIN_VERSION: 1.5.1 jobs: linux: diff --git a/pyproject.toml b/pyproject.toml index 76669182..92097288 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,7 +65,7 @@ Source = 'https://github.com/emmett-framework/granian' granian = 'granian:cli.entrypoint' [build-system] -requires = ['maturin>=1.1.0,<1.5.0'] +requires = ['maturin>=1.1.0,<2'] build-backend = 'maturin' [tool.maturin]