Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test_cross with cross 0.2.2 #251

Merged
merged 2 commits into from
Jun 26, 2022
Merged

Fix test_cross with cross 0.2.2 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79cd707
Fix `test_cross` with cross 0.2.2
messense Jun 26, 2022
94e1cb9
Try update `Cross.toml`
messense Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ jobs:
toolchain: stable
override: true
- name: Install cross
run: cargo install --version 0.2.1 cross
run: cargo install cross
- name: Build package
run: pip install -e .
- name: Build wheel using cross
Expand Down
8 changes: 3 additions & 5 deletions examples/namespace_package/Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
[target.aarch64-unknown-linux-gnu]
image = "cross-pyo3:aarch64-unknown-linux-gnu"

[build.env]
passthrough = [
env.passthrough = [
"RUST_BACKTRACE",
"RUST_LOG",
"PYO3_CROSS_LIB_DIR",
"RUST_LOG",
"PYO3_CROSS_LIB_DIR",
]
1 change: 1 addition & 0 deletions setuptools_rust/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ def _prepare_build_environment(cross_lib: Optional[str]) -> Dict[str, str]:
if cross_lib:
env.setdefault("PYO3_CROSS_LIB_DIR", cross_lib)

env.pop("CARGO", None)
return env


Expand Down