From e9c345c3aff5d3703006c376d1d7b6a05d367eb3 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 3 Nov 2020 14:52:00 -0800 Subject: [PATCH 1/2] Make licensing more explicit --- Cargo.toml | 2 +- README.md | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 9378604f6..67a71a53c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ documentation = "https://docs.rs/num" homepage = "https://github.com/rust-num/num" keywords = ["mathematics", "numerics", "bignum"] categories = [ "algorithms", "data-structures", "science", "no-std" ] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" repository = "https://github.com/rust-num/num" name = "num" version = "0.3.0" diff --git a/README.md b/README.md index 13b58f889..0ba79e01a 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,21 @@ The `num` crate as a whole is tested for rustc 1.31 and greater. The `num-traits`, `num-integer`, and `num-iter` crates are individually tested for rustc 1.8 and greater, if you require such older compatibility. +## License + +Licensed under either of + + * [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) + * [MIT license](http://opensource.org/licenses/MIT) + +at your option. + +### Contribution + +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. + [`num-bigint`]: https://github.com/rust-num/num-bigint [bigint-c]: https://crates.io/crates/num-bigint From 89cd4b2fc79874cec7cec51af1b6770908e82811 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 3 Nov 2020 14:55:41 -0800 Subject: [PATCH 2/2] Release 0.3.1 --- Cargo.toml | 14 +++++++------- RELEASES.md | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 67a71a53c..c0105c704 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ categories = [ "algorithms", "data-structures", "science", "no-std" ] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-num/num" name = "num" -version = "0.3.0" +version = "0.3.1" readme = "README.md" exclude = ["/bors.toml", "/ci/*", "/.github/*"] edition = "2018" @@ -23,29 +23,29 @@ travis-ci = { repository = "rust-num/num" } [dependencies.num-bigint] optional = true # needs std until Rust 1.36 -version = "0.3.0" +version = "0.3.1" default-features = false [dependencies.num-complex] -version = "0.3.0" +version = "0.3.1" default-features = false [dependencies.num-integer] -version = "0.1.43" +version = "0.1.44" default-features = false features = ["i128"] [dependencies.num-iter] -version = "0.1.41" +version = "0.1.42" default-features = false features = ["i128"] [dependencies.num-rational] -version = "0.3.0" +version = "0.3.1" default-features = false [dependencies.num-traits] -version = "0.2.12" +version = "0.2.14" default-features = false features = ["i128"] diff --git a/RELEASES.md b/RELEASES.md index 20401decd..96dec1bee 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,8 @@ +# Release 0.3.1 (2020-11-03) + +- Updated all sub-crates to their latest versions. +- Clarify the license specification as "MIT OR Apache-2.0". + # Release 0.3.0 (2020-06-13) All items exported from `num-integer`, `num-iter`, and `num-traits` are still