Skip to content

Commit

Permalink
Merge pull request #1594 from messense/release-0.15.0
Browse files Browse the repository at this point in the history
Release v0.15.0
  • Loading branch information
messense committed May 7, 2023
2 parents 5c774f0 + f011c24 commit b44af73
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
14 changes: 7 additions & 7 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 = "1.0.0-beta.9"
version = "0.15.0"
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
5 changes: 4 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.15.0] - 2023-05-07

* **Breaking Change**: Build with `--no-default-features` by default when bootstrapping from sdist in [#1333](https://github.com/PyO3/maturin/pull/1333)
* **Breaking Change**: Remove deprecated `sdist-include` option in `pyproject.toml` in [#1335](https://github.com/PyO3/maturin/pull/1335)
* **Breaking Change**: Remove deprecated `python-source` option in `Cargo.toml` in [#1335](https://github.com/PyO3/maturin/pull/1335)
Expand Down Expand Up @@ -850,7 +852,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.17...HEAD
[Unreleased]: https://github.com/pyo3/maturin/compare/v0.15.0...HEAD
[0.15.0]: https://github.com/pyo3/maturin/compare/v0.14.17...v0.15.0
[0.14.17]: https://github.com/pyo3/maturin/compare/v0.14.16...v0.14.17
[0.14.16]: https://github.com/pyo3/maturin/compare/v0.14.15...v0.14.16
[0.14.15]: https://github.com/pyo3/maturin/compare/v0.14.14...v0.14.15
Expand Down
10 changes: 6 additions & 4 deletions src/pyproject_toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,17 @@ impl PyProjectToml {
.iter()
.find(|x| x.name == maturin)
{
let current_major: usize = env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap();
// Note: Update this once 1.0 is out
assert_eq!(env!("CARGO_PKG_VERSION_MAJOR"), "0");
let current_minor: usize = env!("CARGO_PKG_VERSION_MINOR").parse().unwrap();
if requires_maturin.version_or_url.is_none() {
eprintln!(
"⚠️ Warning: Please use {maturin} in pyproject.toml with a version constraint, \
e.g. `requires = [\"{maturin}>={current}.0,<{next}.0\"]`. \
e.g. `requires = [\"{maturin}>=0.{current},<0.{next}\"]`. \
This will become an error.",
maturin = maturin,
current = current_major,
next = current_major + 1,
current = current_minor,
next = current_minor + 1,
);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/Cargo.toml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ crate-type = ["cdylib"]

[dependencies]
{% if bindings == "pyo3" -%}
pyo3 = "0.18.1"
pyo3 = "0.18.3"
{% elif bindings == "rust-cpython" -%}
cpython = "0.7.1"
{% elif bindings == "uniffi" -%}
Expand Down
2 changes: 1 addition & 1 deletion src/templates/pyproject.toml.j2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["maturin>={{ version_major }}.{{ version_minor }},<{{ version_major + 1 }}.0"]
requires = ["maturin>={{ version_major }}.{{ version_minor }},<{{ version_major }}.{{ version_minor + 1 }}"]
build-backend = "maturin"

[project]
Expand Down

0 comments on commit b44af73

Please sign in to comment.