Upgrade pyo3 to 0.20

PyO3 · Oct 12, 2023 · 53f7499 · 53f7499
1 parent 1671b00
commit 53f7499
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,11 +22,11 @@ num-complex = ">= 0.2, < 0.5"
 num-integer = "0.1"
 num-traits = "0.2"
 ndarray = ">= 0.13, < 0.16"
-pyo3 = { version = "0.19", default-features = false, features = ["macros"] }
+pyo3 = { version = "0.20", default-features = false, features = ["macros"] }
 rustc-hash = "1.1"
 
 [dev-dependencies]
-pyo3 = { version = "0.19", default-features = false, features = ["auto-initialize"] }
+pyo3 = { version = "0.20", default-features = false, features = ["auto-initialize"] }
 nalgebra = { version = "0.32", default-features = false, features = ["std"] }
 
 [package.metadata.docs.rs]

diff --git a/examples/linalg/Cargo.toml b/examples/linalg/Cargo.toml
@@ -9,7 +9,7 @@ name = "rust_linalg"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.19", features = ["extension-module"] }
+pyo3 = { version = "0.20", features = ["extension-module"] }
 numpy = { path = "../.." }
 ndarray-linalg = { version = "0.14.1", features = ["openblas-system"] }
 

diff --git a/examples/linalg/pyproject.toml b/examples/linalg/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
 build-backend = "maturin"
-requires = ["maturin>=0.13,<0.14"]
+requires = ["maturin>=1.0,<2.0"]
diff --git a/examples/parallel/Cargo.toml b/examples/parallel/Cargo.toml
@@ -9,7 +9,7 @@ name = "rust_parallel"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.19", features = ["extension-module", "multiple-pymethods"] }
+pyo3 = { version = "0.20", features = ["extension-module", "multiple-pymethods"] }
 numpy = { path = "../.." }
 ndarray = { version = "0.15", features = ["rayon", "blas"] }
 blas-src = { version = "0.8", features = ["openblas"] }

diff --git a/examples/parallel/pyproject.toml b/examples/parallel/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
 build-backend = "maturin"
-requires = ["maturin>=0.13,<0.14"]
+requires = ["maturin>=1.0,<2.0"]
diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml
@@ -9,7 +9,7 @@ name = "rust_ext"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.19", features = ["extension-module", "abi3-py37"] }
+pyo3 = { version = "0.20", features = ["extension-module", "abi3-py37"] }
 numpy = { path = "../.." }
 
 [workspace]
diff --git a/examples/simple/pyproject.toml b/examples/simple/pyproject.toml
@@ -1,3 +1,3 @@
 [build-system]
 build-backend = "maturin"
-requires = ["maturin>=0.13,<0.14"]
+requires = ["maturin>=1.0,<2.0"]
diff --git a/examples/simple/src/lib.rs b/examples/simple/src/lib.rs
@@ -91,6 +91,7 @@ fn rust_ext<'py>(_py: Python<'py>, m: &'py PyModule) -> PyResult<()> {
         let x = d
             .get_item("x")
             .unwrap()
+            .unwrap()
             .downcast::<PyArray1<f64>>()
             .unwrap();
 

diff --git a/src/array.rs b/src/array.rs
@@ -155,7 +155,7 @@ impl<T, D> Deref for PyArray<T, D> {
     }
 }
 
-impl<T, D> AsPyPointer for PyArray<T, D> {
+unsafe impl<T, D> AsPyPointer for PyArray<T, D> {
     #[inline]
     fn as_ptr(&self) -> *mut ffi::PyObject {
         self.0.as_ptr()

diff --git a/src/dtype.rs b/src/dtype.rs
@@ -12,8 +12,8 @@ use pyo3::{
     ffi::{self, PyTuple_Size},
     pyobject_native_type_extract, pyobject_native_type_named,
     types::{PyDict, PyTuple, PyType},
-    AsPyPointer, FromPyObject, FromPyPointer, IntoPyPointer, PyAny, PyNativeType, PyObject,
-    PyResult, PyTypeInfo, Python, ToPyObject,
+    AsPyPointer, FromPyObject, FromPyPointer, PyAny, PyNativeType, PyObject, PyResult, PyTypeInfo,
+    Python, ToPyObject,
 };
 #[cfg(feature = "half")]
 use pyo3::{sync::GILOnceCell, IntoPy, Py};
@@ -352,7 +352,7 @@ impl PyArrayDescr {
         let dict = unsafe { PyDict::from_borrowed_ptr(self.py(), (*self.as_dtype_ptr()).fields) };
         // NumPy guarantees that fields are tuples of proper size and type, so this should never panic.
         let tuple = dict
-            .get_item(name)
+            .get_item(name)?
             .ok_or_else(|| PyIndexError::new_err(name.to_owned()))?
             .downcast::<PyTuple>()
             .unwrap();
@@ -609,6 +609,7 @@ mod tests {
             let dt = locals
                 .get_item("dtype")
                 .unwrap()
+                .unwrap()
                 .downcast::<PyArrayDescr>()
                 .unwrap();
 
@@ -644,6 +645,7 @@ mod tests {
             let dt = locals
                 .get_item("dtype")
                 .unwrap()
+                .unwrap()
                 .downcast::<PyArrayDescr>()
                 .unwrap();