From 35471b92b23919e63820c3a2e794446e221b7688 Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 23 May 2023 11:10:43 +0000 Subject: [PATCH 1/2] Revert "Revert to 0.x versioning in pyproject.toml" This reverts commit 28cd313a3a7c299b5828a633ed864e0274ae022c. --- src/pyproject_toml.rs | 10 ++++------ src/templates/pyproject.toml.j2 | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/pyproject_toml.rs b/src/pyproject_toml.rs index 394b86d71..b8e50c62a 100644 --- a/src/pyproject_toml.rs +++ b/src/pyproject_toml.rs @@ -311,17 +311,15 @@ impl PyProjectToml { .iter() .find(|x| x.name == maturin) { - // 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(); + let current_major: usize = env!("CARGO_PKG_VERSION_MAJOR").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}>=0.{current},<0.{next}\"]`. \ + e.g. `requires = [\"{maturin}>={current}.0,<{next}.0\"]`. \ This will become an error.", maturin = maturin, - current = current_minor, - next = current_minor + 1, + current = current_major, + next = current_major + 1, ); return false; } diff --git a/src/templates/pyproject.toml.j2 b/src/templates/pyproject.toml.j2 index 412cb537e..ae5e60f10 100644 --- a/src/templates/pyproject.toml.j2 +++ b/src/templates/pyproject.toml.j2 @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>={{ version_major }}.{{ version_minor }},<{{ version_major }}.{{ version_minor + 1 }}"] +requires = ["maturin>={{ version_major }}.{{ version_minor }},<{{ version_major + 1 }}.0"] build-backend = "maturin" [project] From 2bc6c26e444735e7b28f8387bcf6ddcf85aa96c7 Mon Sep 17 00:00:00 2001 From: messense Date: Tue, 23 May 2023 11:13:55 +0000 Subject: [PATCH 2/2] Release 1.0.0 --- Cargo.lock | 2 +- Cargo.toml | 2 +- Changelog.md | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6db2e2fa..0f875dfdf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1021,7 +1021,7 @@ dependencies = [ [[package]] name = "maturin" -version = "0.15.3" +version = "1.0.0" dependencies = [ "anyhow", "base64 0.13.1", diff --git a/Cargo.toml b/Cargo.toml index ae5645e9a..5e15be108 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["konstin ", "messense "] name = "maturin" -version = "0.15.3" +version = "1.0.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" diff --git a/Changelog.md b/Changelog.md index 3f42a840b..b831ca22d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.0] - 2023-05-23 + * Add support for multiple `--config-settings` in PEP517 backend in [#1624](https://github.com/PyO3/maturin/pull/1624) +* Remove deprecated `--universal2` cli option in [#1620](https://github.com/PyO3/maturin/pull/1620), + use `--target universal2-apple-darwin` instead. ## [0.15.3] - 2023-05-20 @@ -869,7 +873,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.15.3...HEAD +[Unreleased]: https://github.com/pyo3/maturin/compare/v1.0.0...HEAD +[1.0.0]: https://github.com/pyo3/maturin/compare/v0.15.3...v1.0.0 [0.15.3]: https://github.com/pyo3/maturin/compare/v0.15.2...v0.15.3 [0.15.2]: https://github.com/pyo3/maturin/compare/v0.15.1...v0.15.2 [0.15.1]: https://github.com/pyo3/maturin/compare/v0.15.0...v0.15.1