Upgrade maturin

src/maturin_import_hook/settings.py

@@ -121,6 +121,7 @@ class MaturinDevelopSettings(MaturinSettings):
     """settings for `maturin develop`."""
 
     extras: Optional[list[str]] = None
+    uv: bool = False
     skip_install: bool = False
 
     @staticmethod
@@ -132,6 +133,8 @@ def to_args(self) -> list[str]:
         if self.extras is not None:
             args.append("--extras")
             args.append(",".join(self.extras))
+        if self.uv:
+            args.append("--uv")
         if self.skip_install:
             args.append("--skip-install")
         args.extend(super().to_args())

tests/README.md

@@ -34,6 +34,8 @@ To update maturin:
 - update the submodule to the maturin commit you want to update to
 - re-run the `package_resolver` to update `resolved.json` (see `package_resolver/README.md` for instructions)
 - update `requirements.txt` to match the packages and versions used by the maturin ci (`.github/workflows.test.yml`)
+    - check the `uniffi` package version listed in the `Cargo.toml` of any of the `uniffi-*`
+      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`
 - update the version check in the import hook to ensure it allows using the new version

tests/requirements.txt

@@ -1,9 +1,9 @@
 -e ..
 uv
-maturin==1.5.0
+maturin==1.6.0
 pytest
 junit2html
-uniffi-bindgen==0.26.0
+uniffi-bindgen==0.27.0
 cffi
 
 # required for pyo3-mixed

tests/resolved.json

@@ -1,5 +1,5 @@
 {
-  "commit": "7d711f0c4a7c052608dc2e16d5c6721b9666d076",
+  "commit": "894231c644c2d7a9a31349c86b3f3c431b74d615",
   "crates": {
     "cffi-mixed": {
       "cargo_manifest_path": "Cargo.toml",

tests/test_import_hook/file_importer_helpers/my_script_1.rs

@@ -4,7 +4,7 @@ use pyo3::prelude::*;
 fn get_num() -> usize { 10 }
 
 #[pymodule]
-fn my_script(_py: Python, m: &PyModule) -> PyResult<()> {
+fn my_script(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(get_num))?;
     Ok(())
 }

tests/test_import_hook/file_importer_helpers/my_script_2.rs

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

tests/test_import_hook/file_importer_helpers/my_script_3.rs

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

tests/test_import_hook/file_importer_helpers/packages/my_rust_module.rs

@@ -1,13 +1,12 @@
 use pyo3::prelude::*;
-use pyo3::wrap_pyfunction;
 
 #[pyfunction]
 pub fn do_something(a: usize, b: usize) -> PyResult<usize> {
     Ok(a + b)
 }
 
 #[pymodule]
-pub fn my_rust_module(_py: Python, m: &PyModule) -> PyResult<()> {
+pub fn my_rust_module(_py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(do_something))?;
     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(py, "logging")?;
+        let logging = PyModule::import_bound(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(py, "logging")?;
+        let logging = PyModule::import_bound(py, "logging")?;
         let message = format!(
             "comparing PicklableInteger instances {} and {}",
             self.name, other.name
@@ -88,15 +88,15 @@ fn get_str() -> String {
     string
 }
 
-fn register_child_module(py: Python<'_>, parent_module: &PyModule) -> PyResult<()> {
-    let child_module = PyModule::new(py, "child")?;
+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))?;
-    parent_module.add_submodule(child_module)?;
+    parent_module.add_submodule(&child_module)?;
     Ok(())
 }
 
 #[pymodule]
-fn my_module(py: Python, m: &PyModule) -> PyResult<()> {
+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))?;
@@ -105,19 +105,19 @@ fn my_module(py: Python, m: &PyModule) -> PyResult<()> {
 
     register_child_module(py, m)?;
 
-    let data = PyDict::new(py);
+    let data = PyDict::new_bound(py);
     data.set_item("foo", 123)?;
     m.add("data", data)?;
 
     if !m.hasattr("data_init_once")? {
-        let data = PyDict::new(py);
+        let data = PyDict::new_bound(py);
         data.set_item("foo", 123)?;
         m.add("data_init_once", data)?;
     }
 
     m.add("data_str", "foo")?;
 
-    let logging = PyModule::import(py, "logging")?;
+    let logging = PyModule::import_bound(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.20.2", features = ["extension-module"] }
+pyo3 = { version = "0.21.2", features = ["extension-module"] }
 
 [lib]
 crate-type = ["cdylib"]

tests/test_import_hook/project_importer_helpers/blank-project/src/lib.rs

@@ -1,6 +1,6 @@
 use pyo3::prelude::*;
 
 #[pymodule]
-fn blank_project(_py: Python, _m: &PyModule) -> PyResult<()> {
+fn blank_project(_m: &Bound<'_, PyModule>) -> PyResult<()> {
     Ok(())
 }

tests/test_import_hook/project_importer_helpers/my_project.rs

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

tests/test_import_hook/project_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(py, "logging")?;
+        let logging = PyModule::import_bound(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(py, "logging")?;
+        let logging = PyModule::import_bound(py, "logging")?;
         let message = format!(
             "comparing PicklableInteger instances {} and {}",
             self.name, other.name
@@ -88,15 +88,15 @@ fn get_str() -> String {
     string
 }
 
-fn register_child_module(py: Python<'_>, parent_module: &PyModule) -> PyResult<()> {
-    let child_module = PyModule::new(py, "child")?;
+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))?;
-    parent_module.add_submodule(child_module)?;
+    parent_module.add_submodule(&child_module)?;
     Ok(())
 }
 
 #[pymodule]
-fn my_project(py: Python, m: &PyModule) -> PyResult<()> {
+fn my_project(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))?;
@@ -105,19 +105,19 @@ fn my_project(py: Python, m: &PyModule) -> PyResult<()> {
 
     register_child_module(py, m)?;
 
-    let data = PyDict::new(py);
+    let data = PyDict::new_bound(py);
     data.set_item("foo", 123)?;
     m.add("data", data)?;
 
     if !m.hasattr("data_init_once")? {
-        let data = PyDict::new(py);
+        let data = PyDict::new_bound(py);
         data.set_item("foo", 123)?;
         m.add("data_init_once", data)?;
     }
 
     m.add("data_str", "foo")?;
 
-    let logging = PyModule::import(py, "logging")?;
+    let logging = PyModule::import_bound(py, "logging")?;
     logging
         .getattr("info")?
         .call1(("my_project extension module initialised",))?;

tests/test_import_hook/test_project_importer.py

@@ -1395,7 +1395,7 @@ def _install_editable(project_dir: Path) -> None:
     assert maturin_path is not None
     env = os.environ.copy()
     env["VIRTUAL_ENV"] = sys.exec_prefix
-    subprocess.check_call([maturin_path, "develop"], cwd=project_dir, env=env)
+    subprocess.check_call([maturin_path, "develop", "--uv"], cwd=project_dir, env=env)
 
 
 def _install_non_editable(project_dir: Path) -> None: