From 999bdf6b015d51d8a849527fe88ee7f9d016f665 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Mon, 11 Aug 2025 16:48:40 -0400 Subject: [PATCH] Clean up ciwb before steps --- rust/pyproject.toml.jinja | 13 ------------- rustjswasm/pyproject.toml.jinja | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/rust/pyproject.toml.jinja b/rust/pyproject.toml.jinja index 17aa740..4ea7595 100644 --- a/rust/pyproject.toml.jinja +++ b/rust/pyproject.toml.jinja @@ -91,7 +91,6 @@ ignore = [ ] [tool.cibuildwheel] -before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y" build = "cp39-*" test-command = "pytest -vvv {project}/{{module}}/tests" test-requires = ["pytest", "pytest-cov", "pytest-sugar", "pytest-xdist"] @@ -107,22 +106,10 @@ environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always"} skip = "*i686* *musllinux*" [tool.cibuildwheel.macos] -before-all = """ -curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y -rustup target add aarch64-apple-darwin -rustup target add x86_64-apple-darwin -rustup show -""" environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always", MACOS_DEPLOYMENT_TARGET=11.0} archs = "arm64" [tool.cibuildwheel.windows] -before-all = """ -curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y -rustup target add x86_64-pc-windows-msvc -rustup target add aarch64-pc-windows-msvc -rustup show -""" environment = {PATH="$UserProfile\\.cargo\bin;$PATH", CARGO_TERM_COLOR="always"} skip = "*win32 *arm_64" diff --git a/rustjswasm/pyproject.toml.jinja b/rustjswasm/pyproject.toml.jinja index c107ef1..cb6c241 100644 --- a/rustjswasm/pyproject.toml.jinja +++ b/rustjswasm/pyproject.toml.jinja @@ -111,7 +111,7 @@ test-command = "pytest -vvv {project}/{{module}}/tests" test-requires = ["pytest", "pytest-cov", "pytest-sugar", "pytest-xdist"] [tool.cibuildwheel.linux] -before-build = """ +before-all = """ curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y rustup target add aarch64-unknown-linux-gnu rustup target add x86_64-unknown-linux-gnu