upgrade pyo3

tests/README.md

@@ -39,6 +39,8 @@ To update maturin:
       test crates and update `uniffi-bindgen` in `requirements.txt` to match.
 - check that no crates have been added to `test-crates` that should be excluded from the import hook tests.
   If so, add them to `IGNORED_TEST_CRATES` in `common.py`
+- upgrade the test packages in `test_import_hook/*_helpers`
+    - check what version of `pyo3` is used by the command: `maturin new --bindings pyo3`
 - update the version check in the import hook to ensure it allows using the new version
 - run the tests to ensure everything still works
 

tests/test_import_hook/file_importer_helpers/my_script_1.rs

@@ -5,6 +5,6 @@ fn get_num() -> usize { 10 }
 
 #[pymodule]
 fn my_script(m: &Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pyfunction!(get_num))?;
+    m.add_function(wrap_pyfunction!(get_num, m)?)?;
     Ok(())
 }

tests/test_import_hook/file_importer_helpers/my_script_2.rs

@@ -8,7 +8,7 @@ fn get_other_num() -> usize { 100 }
 
 #[pymodule]
 fn my_script(m: &Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pyfunction!(get_num))?;
-    m.add_wrapped(wrap_pyfunction!(get_other_num))?;
+    m.add_function(wrap_pyfunction!(get_num, m)?)?;
+    m.add_function(wrap_pyfunction!(get_other_num, m)?)?;
     Ok(())
 }

tests/test_import_hook/file_importer_helpers/my_script_3.rs

@@ -11,6 +11,6 @@ fn get_num() -> usize {
 
 #[pymodule]
 fn my_script(m: &Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pyfunction!(get_num))?;
+    m.add_function(wrap_pyfunction!(get_num, m)?)?;
     Ok(())
 }

tests/test_import_hook/file_importer_helpers/packages/my_rust_module.rs

@@ -7,6 +7,6 @@ pub fn do_something(a: usize, b: usize) -> PyResult<usize> {
 
 #[pymodule]
 pub fn my_rust_module(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pyfunction!(do_something))?;
+    m.add_function(wrap_pyfunction!(do_something, m)?)?;
     Ok(())
 }

tests/test_import_hook/file_importer_helpers/packages/subpackage/my_rust_module.rs

@@ -1,5 +1,4 @@
 use pyo3::prelude::*;
-use pyo3::wrap_pyfunction;
 
 #[pyfunction]
 pub fn get_num() -> PyResult<usize> {
@@ -8,6 +7,6 @@ pub fn get_num() -> PyResult<usize> {
 
 #[pymodule]
 pub fn my_rust_module(_py: Python, m: &PyModule) -> PyResult<()> {
-    m.add_wrapped(wrap_pyfunction!(get_num))?;
+    m.add_function(wrap_pyfunction!(get_num, m)?)?;
     Ok(())
 }

tests/test_import_hook/file_importer_helpers/reload_template.rs

@@ -40,7 +40,7 @@ impl Integer {
     }
 
     fn __richcmp__(&self, other: &Self, op: CompareOp, py: Python<'_>) -> PyResult<bool> {
-        let logging = PyModule::import_bound(py, "logging")?;
+        let logging = PyModule::import(py, "logging")?;
         let message = format!(
             "comparing Integer instances {} and {}",
             self.name, other.name
@@ -66,7 +66,7 @@ impl PicklableInteger {
     }
 
     fn __richcmp__(&self, other: &Self, op: CompareOp, py: Python<'_>) -> PyResult<bool> {
-        let logging = PyModule::import_bound(py, "logging")?;
+        let logging = PyModule::import(py, "logging")?;
         let message = format!(
             "comparing PicklableInteger instances {} and {}",
             self.name, other.name
@@ -89,35 +89,35 @@ fn get_str() -> String {
 }
 
 fn register_child_module(py: Python<'_>, parent_module: &Bound<'_, PyModule>) -> PyResult<()> {
-    let child_module = PyModule::new_bound(py, "child")?;
-    child_module.add_wrapped(wrap_pyfunction!(get_str))?;
+    let child_module = PyModule::new(py, "child")?;
+    child_module.add_function(wrap_pyfunction!(get_str, &child_module)?)?;
     parent_module.add_submodule(&child_module)?;
     Ok(())
 }
 
 #[pymodule]
 fn my_module(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
-    m.add_wrapped(wrap_pyfunction!(get_num))?;
-    m.add_wrapped(wrap_pyfunction!(get_global_num))?;
-    m.add_wrapped(wrap_pyfunction!(set_global_num))?;
+    m.add_function(wrap_pyfunction!(get_num, m)?)?;
+    m.add_function(wrap_pyfunction!(get_global_num, m)?)?;
+    m.add_function(wrap_pyfunction!(set_global_num, m)?)?;
     m.add_class::<Integer>()?;
     m.add_class::<PicklableInteger>()?;
 
     register_child_module(py, m)?;
 
-    let data = PyDict::new_bound(py);
+    let data = PyDict::new(py);
     data.set_item("foo", 123)?;
     m.add("data", data)?;
 
     if !m.hasattr("data_init_once")? {
-        let data = PyDict::new_bound(py);
+        let data = PyDict::new(py);
         data.set_item("foo", 123)?;
         m.add("data_init_once", data)?;
     }
 
     m.add("data_str", "foo")?;
 
-    let logging = PyModule::import_bound(py, "logging")?;
+    let logging = PyModule::new(py, "logging")?;
     logging
         .getattr("info")?
         .call1(("my_module extension module initialised",))?;

tests/test_import_hook/project_importer_helpers/blank-project/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 description = ""
 
 [dependencies]
-pyo3 = { version = "0.21.2", features = ["extension-module"] }
+pyo3 = { version = "0.23.1", features = ["extension-module"] }
 
 [lib]
 crate-type = ["cdylib"]