diff --git a/CHANGELOG.md b/CHANGELOG.md index b6d89b6fb..fe49ea1e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +- v0.15.0 + - [Remove resolver from Cargo.toml](https://github.com/PyO3/rust-numpy/pull/202) + - [Bump PyO3 to 0.15](https://github.com/PyO3/rust-numpy/pull/212) + - v0.14.1 - [Fix MSRV support](https://github.com/PyO3/rust-numpy/issues/198) diff --git a/Cargo.toml b/Cargo.toml index 14e1a0402..006c0900b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "numpy" -version = "0.14.1" +version = "0.15.0" authors = [ "Toshiki Teramura ", "Yuji Kanagawa ", diff --git a/README.md b/README.md index 106509c07..86e77a790 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ on anything but that exact range. It can therefore be necessary to manually unif For example, if you specify the following dependencies ```toml -numpy = "0.14" +numpy = "0.15" ndarray = "0.13" ``` @@ -80,8 +80,8 @@ to achieve a single dependency on version `0.13.1` of `ndarray`. name = "numpy-test" [dependencies] -pyo3 = "0.14" -numpy = "0.14" +pyo3 = "0.15" +numpy = "0.15" ``` ```rust @@ -117,11 +117,10 @@ name = "rust_ext" crate-type = ["cdylib"] [dependencies] -numpy = "0.14" -ndarray = "0.14" +numpy = "0.15" [dependencies.pyo3] -version = "0.14" +version = "0.15" features = ["extension-module"] ``` diff --git a/examples/linalg/Cargo.toml b/examples/linalg/Cargo.toml index 9f58cdc39..4b1c13aa1 100644 --- a/examples/linalg/Cargo.toml +++ b/examples/linalg/Cargo.toml @@ -10,9 +10,7 @@ crate-type = ["cdylib"] [dependencies] numpy = { path = "../.." } -ndarray = "0.15" -# ndarray-linalg = { version = "0.13", features = ["openblas-static"] } -ndarray-linalg = { git = "https://github.com/rust-ndarray/ndarray-linalg", features = ["openblas-static"] } +ndarray-linalg = { version = "0.14.1", features = ["openblas-static"] } [dependencies.pyo3] version = "0.15" diff --git a/examples/simple-extension/Cargo.toml b/examples/simple-extension/Cargo.toml index 75a8aa8c8..0c3b14aae 100644 --- a/examples/simple-extension/Cargo.toml +++ b/examples/simple-extension/Cargo.toml @@ -10,7 +10,6 @@ crate-type = ["cdylib"] [dependencies] numpy = { path = "../.." } -ndarray = "0.15.2" num-complex = "0.4.0" [dependencies.pyo3] diff --git a/examples/simple-extension/src/lib.rs b/examples/simple-extension/src/lib.rs index 8eebea6a3..321377136 100644 --- a/examples/simple-extension/src/lib.rs +++ b/examples/simple-extension/src/lib.rs @@ -1,4 +1,4 @@ -use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD}; +use numpy::ndarray::{ArrayD, ArrayViewD, ArrayViewMutD}; use numpy::{c64, IntoPyArray, PyArrayDyn, PyReadonlyArrayDyn}; use pyo3::prelude::{pymodule, PyModule, PyResult, Python};