From 1197e3ae56fe5c962067ccb872c54f4c80170035 Mon Sep 17 00:00:00 2001 From: Jake Lishman Date: Sun, 7 Apr 2024 17:45:28 +0100 Subject: [PATCH] DNM: test wheel builds with Rust 1.70 --- .github/workflows/wheels.yml | 75 +++++------------------------------- pyproject.toml | 4 +- 2 files changed, 11 insertions(+), 68 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 67104433a3dc..2d643d9940c3 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,14 +1,13 @@ --- name: Wheel Builds on: - push: - tags: - - '*' + pull_request: + branches: '*' + jobs: build_wheels: name: Build wheels runs-on: ${{ matrix.os }} - environment: release strategy: fail-fast: false matrix: @@ -19,7 +18,7 @@ jobs: name: Install Python with: python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@1.70 with: components: llvm-tools-preview - name: Build wheels @@ -47,7 +46,7 @@ jobs: name: Install Python with: python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@1.70 with: components: llvm-tools-preview - name: Build wheels @@ -61,7 +60,6 @@ jobs: build_wheels_macos_arm: name: Build wheels on macOS arm runs-on: ${{ matrix.os }} - environment: release strategy: fail-fast: false matrix: @@ -72,7 +70,7 @@ jobs: name: Install Python with: python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@1.70 - name: Build wheels uses: pypa/cibuildwheel@v2.17.0 env: @@ -85,27 +83,9 @@ jobs: with: path: ./wheelhouse/*.whl name: wheels-${{ matrix.os }}-arm - upload_shared_wheels: - name: Upload shared build wheels - runs-on: ubuntu-latest - environment: release - permissions: - id-token: write - needs: ["build_wheels", "build_wheels_macos_arm", "build_wheels_32bit"] - steps: - - uses: actions/download-artifact@v4 - with: - pattern: 'wheels-*' - merge-multiple: true - path: deploy - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: deploy build_wheels_s390x: name: Build wheels on s390x runs-on: ${{ matrix.os }} - environment: release permissions: id-token: write strategy: @@ -118,7 +98,7 @@ jobs: name: Install Python with: python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@1.70 - name: Set up QEMU uses: docker/setup-qemu-action@v3 with: @@ -132,14 +112,9 @@ jobs: with: name: wheels-${{ matrix.os }}-s390x path: ./wheelhouse/*.whl - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: wheelhouse/ build_wheels_ppc64le: name: Build wheels on ppc64le runs-on: ${{ matrix.os }} - environment: release permissions: id-token: write strategy: @@ -152,7 +127,7 @@ jobs: name: Install Python with: python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@1.70 - name: Set up QEMU uses: docker/setup-qemu-action@v3 with: @@ -166,14 +141,9 @@ jobs: with: name: wheels-${{ matrix.os }}-ppc64le path: ./wheelhouse/*.whl - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: wheelhouse/ build_wheels_aarch64: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} - environment: release permissions: id-token: write strategy: @@ -186,7 +156,7 @@ jobs: name: Install Python with: python-version: '3.10' - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@1.70 - name: Set up QEMU uses: docker/setup-qemu-action@v3 with: @@ -199,30 +169,3 @@ jobs: with: name: wheels-${{ matrix.os }}-aarch64 path: ./wheelhouse/*.whl - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: wheelhouse/ - sdist: - name: Build and publish sdist - runs-on: ${{ matrix.os }} - needs: ["upload_shared_wheels"] - environment: release - permissions: - id-token: write - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - name: Install Python - with: - python-version: '3.10' - - name: Install deps - run: pip install -U build - - name: Build sdist - run: python -m build . --sdist - - name: Publish package distributions to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/pyproject.toml b/pyproject.toml index 8cd6360f97c9..d169b7122408 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -148,11 +148,11 @@ before-test = "pip install --only-binary=numpy,scipy numpy scipy" # specific job override is needed. For example tier 1 platforms locally override # the before-build and environment configuration to enable PGO, # see: .github/workflows/wheels.yml for the jobs where this is done -environment = 'RUSTUP_TOOLCHAIN="stable"' +environment = 'RUSTUP_TOOLCHAIN="1.70"' [tool.cibuildwheel.linux] before-all = "yum install -y wget && {package}/tools/install_rust.sh" -environment = 'PATH="$PATH:$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true" RUSTUP_TOOLCHAIN="stable"' +environment = 'PATH="$PATH:$HOME/.cargo/bin" CARGO_NET_GIT_FETCH_WITH_CLI="true" RUSTUP_TOOLCHAIN="1.70"' repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} && pipx run abi3audit --strict --report {wheel}" [tool.cibuildwheel.macos]