Skip to content

Commit

Permalink
Merge pull request #1482 from messense/release-1.0.0-beta.1
Browse files Browse the repository at this point in the history
Release v1.0.0-beta.1
  • Loading branch information
messense authored Feb 14, 2023
2 parents 5539de1 + b47dd55 commit 112155b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 13 deletions.
10 changes: 5 additions & 5 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.13"
version = "1.0.0-beta.1"
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
10 changes: 4 additions & 6 deletions src/pyproject_toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,17 +239,15 @@ impl PyProjectToml {
.iter()
.find(|x| x.starts_with(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 == maturin {
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 112155b

Please sign in to comment.