Skip to content

Commit 3a223c6

Browse files
authored
Merge pull request #87 from python-project-templates/tkp/cibw
Clean up ciwb before steps
2 parents fa27c8d + 999bdf6 commit 3a223c6

2 files changed

Lines changed: 1 addition & 14 deletions

File tree

rust/pyproject.toml.jinja

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ ignore = [
9191
]
9292

9393
[tool.cibuildwheel]
94-
before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y"
9594
build = "cp39-*"
9695
test-command = "pytest -vvv {project}/{{module}}/tests"
9796
test-requires = ["pytest", "pytest-cov", "pytest-sugar", "pytest-xdist"]
@@ -107,22 +106,10 @@ environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always"}
107106
skip = "*i686* *musllinux*"
108107

109108
[tool.cibuildwheel.macos]
110-
before-all = """
111-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
112-
rustup target add aarch64-apple-darwin
113-
rustup target add x86_64-apple-darwin
114-
rustup show
115-
"""
116109
environment = {PATH="$HOME/.cargo/bin:$PATH", CARGO_TERM_COLOR="always", MACOS_DEPLOYMENT_TARGET=11.0}
117110
archs = "arm64"
118111

119112
[tool.cibuildwheel.windows]
120-
before-all = """
121-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
122-
rustup target add x86_64-pc-windows-msvc
123-
rustup target add aarch64-pc-windows-msvc
124-
rustup show
125-
"""
126113
environment = {PATH="$UserProfile\\.cargo\bin;$PATH", CARGO_TERM_COLOR="always"}
127114
skip = "*win32 *arm_64"
128115

rustjswasm/pyproject.toml.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ test-command = "pytest -vvv {project}/{{module}}/tests"
111111
test-requires = ["pytest", "pytest-cov", "pytest-sugar", "pytest-xdist"]
112112

113113
[tool.cibuildwheel.linux]
114-
before-build = """
114+
before-all = """
115115
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=stable --profile=minimal -y
116116
rustup target add aarch64-unknown-linux-gnu
117117
rustup target add x86_64-unknown-linux-gnu

0 commit comments

Comments
 (0)