Skip to content

Commit

Permalink
Merge pull request #1515 from messense/0.14-backport
Browse files Browse the repository at this point in the history
Release v0.14.15
  • Loading branch information
messense authored Mar 3, 2023
2 parents 2110d39 + 5167a0e commit 3f16f84
Show file tree
Hide file tree
Showing 17 changed files with 266 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
# ring doesn't support aarch64 windows yet
- name: Build wheel (windows aarch64)
if: matrix.target == 'aarch64-pc-windows-msvc'
run: cargo run -- build --release -b bin -o dist --target ${{ matrix.target }} --no-default-features --features log,upload
run: cargo run -- build --release -b bin -o dist --target ${{ matrix.target }} --no-default-features --features log,upload,native-tls

- name: Build wheel (without sdist)
if: ${{ matrix.target != 'x86_64-unknown-linux-musl' && matrix.target != 'aarch64-pc-windows-msvc' }}
Expand Down
83 changes: 36 additions & 47 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["konstin <[email protected]>", "messense <[email protected]>"]
name = "maturin"
version = "0.14.14"
version = "0.14.15"
description = "Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages"
exclude = ["test-crates/**/*", "sysconfig/*", "test-data/*", "ci/*", "tests/*", "guide/*", ".github/*"]
homepage = "https://github.com/pyo3/maturin"
Expand Down
7 changes: 6 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.14.15] - 2023-03-03

* Add sdist and sccache support to `generate-ci` command

## [0.14.14] - 2023-02-24

* Add support for Emscripten in `generate-ci` command in [#1484](https://github.com/PyO3/maturin/pull/1484)
Expand Down Expand Up @@ -822,7 +826,8 @@ points-0.1.0-py2.py3-none-manylinux1_x86_64.whl | 2,8M | 752K | 85K

* Initial Release

[Unreleased]: https://github.com/pyo3/maturin/compare/v0.14.14...HEAD
[Unreleased]: https://github.com/pyo3/maturin/compare/v0.14.15...HEAD
[0.14.15]: https://github.com/pyo3/maturin/compare/v0.14.14...v0.14.15
[0.14.14]: https://github.com/pyo3/maturin/compare/v0.14.13...v0.14.14
[0.14.13]: https://github.com/pyo3/maturin/compare/v0.14.12...v0.14.13
[0.14.12]: https://github.com/pyo3/maturin/compare/v0.14.11...v0.14.12
Expand Down
2 changes: 1 addition & 1 deletion src/auditwheel/audit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ pub fn auditwheel_rs(
if let Some(highest_policy) = highest_policy {
// Don't recommend manylinux1 because rust doesn't support it anymore
if policy.priority < highest_policy.priority && highest_policy.name != "manylinux_2_5" {
println!(
eprintln!(
"📦 Wheel is eligible for a higher priority tag. \
You requested {policy} but this wheel is eligible for {highest_policy}",
);
Expand Down
18 changes: 9 additions & 9 deletions src/build_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fn bin_wasi_helper(
// Having the wasmtime version hardcoded is not ideal, it's easy enough to overwrite
metadata21
.requires_dist
.push("wasmtime>=5.0.0,<6.0.0".to_string());
.push("wasmtime>=6.0.0,<7.0.0".to_string());
}

Ok(metadata21)
Expand Down Expand Up @@ -280,7 +280,7 @@ impl BuildContext {
&& self.target.is_linux()
&& !python_interpreter.support_portable_wheels()
{
println!(
eprintln!(
"🐍 Skipping auditwheel because {python_interpreter} does not support manylinux/musllinux wheels"
);
return Ok((Policy::default(), Vec::new()));
Expand Down Expand Up @@ -444,12 +444,12 @@ impl BuildContext {
writer.add_file_with_permissions(libs_dir.join(new_soname), path, 0o755)?;
}

println!(
eprintln!(
"🖨 Copied external shared libraries to package {} directory:",
libs_dir.display()
);
for lib_path in libs_copied {
println!(" {}", lib_path.display());
eprintln!(" {}", lib_path.display());
}

// Currently artifact .so file always resides at ${module_name}/${module_name}.so
Expand Down Expand Up @@ -571,7 +571,7 @@ impl BuildContext {
min_minor,
)?;

println!(
eprintln!(
"📦 Built wheel for abi3 Python ≥ {}.{} to {}",
major,
min_minor,
Expand Down Expand Up @@ -652,7 +652,7 @@ impl BuildContext {
&platform_tags,
external_libs,
)?;
println!(
eprintln!(
"📦 Built wheel for {} {}.{}{} to {}",
python_interpreter.interpreter_kind,
python_interpreter.major,
Expand Down Expand Up @@ -814,7 +814,7 @@ impl BuildContext {
);
}

println!("📦 Built wheel to {}", wheel_path.display());
eprintln!("📦 Built wheel to {}", wheel_path.display());
wheels.push((wheel_path, tag));

Ok(wheels)
Expand Down Expand Up @@ -869,7 +869,7 @@ impl BuildContext {
};
let (wheel_path, tag) = self.write_uniffi_wheel(artifact, &platform_tags, external_libs)?;

println!("📦 Built wheel to {}", wheel_path.display());
eprintln!("📦 Built wheel to {}", wheel_path.display());
wheels.push((wheel_path, tag));

Ok(wheels)
Expand Down Expand Up @@ -1006,7 +1006,7 @@ impl BuildContext {
&platform_tags,
&ext_libs,
)?;
println!("📦 Built wheel to {}", wheel_path.display());
eprintln!("📦 Built wheel to {}", wheel_path.display());
wheels.push((wheel_path, tag));

Ok(wheels)
Expand Down
Loading

0 comments on commit 3f16f84

Please sign in to comment.