Merge pull request #163 from davidhewitt/pyo3-macro-tidys

Update to PyO3 0.13

Author: kngwyu

CHANGELOG.md

@@ -3,6 +3,9 @@
 - Unreleased
   - Bump num-complex to 0.3
   - Bump ndarray to 0.14
+  - Bump pyo3 to 0.13
+  - Drop support for Python 3.5 (as it is now end-of-life).
+  - Remove unused `python3` feature
 
 - v0.12.1
   - Fix compile error in Rust 1.39

Cargo.toml

@@ -15,13 +15,11 @@ libc = "0.2"
 num-complex = "0.3"
 num-traits = "0.2"
 ndarray = "0.14"
-pyo3 = ">=0.12"
+pyo3 = "0.13"
 
 [features]
 # In default setting, python version is automatically detected
 default = []
-# This is no longer needed but setuptools-rust assumes this feature
-python3 = ["pyo3/python3"]
 
 
 [workspace]

examples/linalg/Cargo.toml

@@ -14,5 +14,5 @@ ndarray = "0.14"
 ndarray-linalg = { git = "https://github.com/kngwyu/ndarray-linalg", branch = "ndarray-014", features = ["openblas-static"] }
 
 [dependencies.pyo3]
-version = "0.12"
+version = "0.13"
 features = ["extension-module"]

examples/simple-extension/Cargo.toml

@@ -10,8 +10,8 @@ crate-type = ["cdylib"]
 
 [dependencies]
 numpy = { path = "../.." }
-ndarray = ">= 0.12"
+ndarray = "0.14"
 
 [dependencies.pyo3]
-version = "0.12"
+version = "0.13"
 features = ["extension-module"]

src/array.rs

@@ -101,23 +101,17 @@ pub fn get_array_module(py: Python<'_>) -> PyResult<&PyModule> {
 unsafe impl<T, D> type_object::PyLayout<PyArray<T, D>> for npyffi::PyArrayObject {}
 impl<T, D> type_object::PySizedLayout<PyArray<T, D>> for npyffi::PyArrayObject {}
 
-pyobject_native_type_convert!(
+pyobject_native_type_info!(
     PyArray<T, D>,
     npyffi::PyArrayObject,
     *npyffi::PY_ARRAY_API.get_type_object(npyffi::NpyTypes::PyArray_Type),
     Some("numpy"),
-    npyffi::PyArray_Check,
-    T, D
+    npyffi::PyArray_Check
+    ; T
+    ; D
 );
 
-pyobject_native_type_named!(PyArray<T, D>, T, D);
-pyobject_native_type_fmt!(PyArray<T, D>, T, D);
-
-impl<'a, T, D> std::convert::From<&'a PyArray<T, D>> for &'a PyAny {
-    fn from(ob: &'a PyArray<T, D>) -> Self {
-        unsafe { &*(ob as *const PyArray<T, D> as *const PyAny) }
-    }
-}
+pyobject_native_type_named!(PyArray<T, D> ; T ; D);
 
 impl<T, D> IntoPy<PyObject> for PyArray<T, D> {
     fn into_py(self, py: Python<'_>) -> PyObject {

src/dtype.rs

@@ -32,8 +32,6 @@ pyobject_native_type_core!(
     arraydescr_check
 );
 
-pyobject_native_type_fmt!(PyArrayDescr);
-
 unsafe fn arraydescr_check(op: *mut ffi::PyObject) -> c_int {
     ffi::PyObject_TypeCheck(
         op,
@@ -54,7 +52,7 @@ impl PyArrayDescr {
     /// pyo3::Python::with_gil(|py| {
     ///    let array = numpy::PyArray::from_vec(py, vec![0.0, 1.0, 2.0f64]);
     ///    let dtype = array.dtype();
-    ///    assert_eq!(dtype.get_type().name().to_string(), "numpy.float64");
+    ///    assert_eq!(dtype.get_type().name().unwrap().to_string(), "float64");
     /// });
     /// ```
     pub fn get_type(&self) -> &PyType {

tests/array.rs

@@ -110,8 +110,8 @@ fn as_slice() {
 fn is_instance() {
     pyo3::Python::with_gil(|py| {
         let arr = PyArray2::<f64>::new(py, [3, 5], false);
-        assert!(py.is_instance::<PyArray2<f64>, _>(arr).unwrap());
-        assert!(!py.is_instance::<PyList, _>(arr).unwrap());
+        assert!(arr.is_instance::<PyArray2<f64>>().unwrap());
+        assert!(!arr.is_instance::<PyList>().unwrap());
     })
 }