Skip to content

Commit 29f2737

Browse files
authored
Merge pull request #215 from PyO3/release-0.15
Bump version to 0.15
2 parents 87c5a65 + 925b915 commit 29f2737

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
- v0.15.0
4+
- [Remove resolver from Cargo.toml](https://github.com/PyO3/rust-numpy/pull/202)
5+
- [Bump PyO3 to 0.15](https://github.com/PyO3/rust-numpy/pull/212)
6+
37
- v0.14.1
48
- [Fix MSRV support](https://github.com/PyO3/rust-numpy/issues/198)
59

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "numpy"
3-
version = "0.14.1"
3+
version = "0.15.0"
44
authors = [
55
"Toshiki Teramura <[email protected]>",
66
"Yuji Kanagawa <[email protected]>",

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ on anything but that exact range. It can therefore be necessary to manually unif
5757
For example, if you specify the following dependencies
5858

5959
```toml
60-
numpy = "0.14"
60+
numpy = "0.15"
6161
ndarray = "0.13"
6262
```
6363

@@ -80,8 +80,8 @@ to achieve a single dependency on version `0.13.1` of `ndarray`.
8080
name = "numpy-test"
8181

8282
[dependencies]
83-
pyo3 = "0.14"
84-
numpy = "0.14"
83+
pyo3 = "0.15"
84+
numpy = "0.15"
8585
```
8686

8787
```rust
@@ -117,11 +117,10 @@ name = "rust_ext"
117117
crate-type = ["cdylib"]
118118

119119
[dependencies]
120-
numpy = "0.14"
121-
ndarray = "0.14"
120+
numpy = "0.15"
122121

123122
[dependencies.pyo3]
124-
version = "0.14"
123+
version = "0.15"
125124
features = ["extension-module"]
126125
```
127126

examples/linalg/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ crate-type = ["cdylib"]
1010

1111
[dependencies]
1212
numpy = { path = "../.." }
13-
ndarray = "0.15"
14-
# ndarray-linalg = { version = "0.13", features = ["openblas-static"] }
15-
ndarray-linalg = { git = "https://github.com/rust-ndarray/ndarray-linalg", features = ["openblas-static"] }
13+
ndarray-linalg = { version = "0.14.1", features = ["openblas-static"] }
1614

1715
[dependencies.pyo3]
1816
version = "0.15"

examples/simple-extension/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
1010

1111
[dependencies]
1212
numpy = { path = "../.." }
13-
ndarray = "0.15.2"
1413
num-complex = "0.4.0"
1514

1615
[dependencies.pyo3]

examples/simple-extension/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
1+
use numpy::ndarray::{ArrayD, ArrayViewD, ArrayViewMutD};
22
use numpy::{c64, IntoPyArray, PyArrayDyn, PyReadonlyArrayDyn};
33
use pyo3::prelude::{pymodule, PyModule, PyResult, Python};
44

0 commit comments

Comments
 (0)