Skip to content

Commit

Permalink
Merge pull request #1625 from messense/release-1.0
Browse files Browse the repository at this point in the history
Release 1.0.0
  • Loading branch information
messense authored May 23, 2023
2 parents c2c9e70 + 2bc6c26 commit 53bb64b
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion 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 <konstin@mailbox.org>", "messense <messense@icloud.com>"]
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"
Expand Down
7 changes: 6 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions src/pyproject_toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
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 }}.{{ version_minor + 1 }}"]
requires = ["maturin>={{ version_major }}.{{ version_minor }},<{{ version_major + 1 }}.0"]
build-backend = "maturin"

[project]
Expand Down

0 comments on commit 53bb64b

Please sign in to comment.