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

Fix CI failure with Rust 1.64.0 #1119

Merged
merged 1 commit into from
Sep 22, 2022
Merged

Fix CI failure with Rust 1.64.0 #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 guide/src/project_layout.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ You can then import your Rust module inside your Python source as follows:
from my_project import _my_project
```

IDEs can then recognize the `_my_project` module as seperate from your main Python source module. This allows for code completion of the types inside your Rust Python module for certain IDEs.
IDEs can then recognize the `_my_project` module as separate from your main Python source module. This allows for code completion of the types inside your Rust Python module for certain IDEs.


## Adding Python type information
Expand Down
10 changes: 7 additions & 3 deletions tests/common/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,13 @@ pub fn test_integration(
// order they are in the build context
for ((filename, supported_version), python_interpreter) in wheels.iter().zip(interpreter) {
if test_zig && build_context.target.is_linux() && !build_context.target.is_musl_target() {
assert!(filename
.to_string_lossy()
.ends_with("manylinux_2_12_x86_64.manylinux2010_x86_64.whl"))
let rustc_ver = rustc_version::version()?;
let file_suffix = if rustc_ver >= semver::Version::new(1, 64, 0) {
"manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
} else {
"manylinux_2_12_x86_64.manylinux2010_x86_64.whl"
};
assert!(filename.to_string_lossy().ends_with(file_suffix))
}
let venv_suffix = if supported_version == "py3" {
"py3".to_string()
Expand Down