upgrade to latest maturin. Fixed failing tests added added debug tools

src/maturin_import_hook/__main__.py

@@ -191,10 +191,12 @@ def _main() -> None:
     install.add_argument(
         "--user",
         action="store_true",
-        help="whether to install into usercustomize.py instead of sitecustomize.py. "
-        "Note that usercustomize.py is shared between virtualenvs of the same interpreter version and is not loaded "
-        "unless the virtualenv is created with the `--system-site-packages` argument. Use `site info` to check "
-        "whether usercustomize.py is loaded the current interpreter.",
+        help=(
+            "whether to install into usercustomize.py instead of sitecustomize.py. "
+            "Note that usercustomize.py is shared between virtualenvs of the same interpreter version and is "
+            "not loaded unless the virtualenv is created with the `--system-site-packages` argument. "
+            "Use `site info` to check whether usercustomize.py is loaded the current interpreter."
+        ),
     )
 
     uninstall = site_sub_actions.add_parser(

src/maturin_import_hook/_resolve_project.py

@@ -142,7 +142,7 @@ def all_path_dependencies(self) -> list[Path]:
 def _find_all_path_dependencies(immediate_path_dependencies: list[Path]) -> list[Path]:
     if not immediate_path_dependencies:
         return []
-    all_path_dependencies = set()
+    all_path_dependencies: set[Path] = set()
     to_search = immediate_path_dependencies.copy()
     while to_search:
         dependency_project_dir = to_search.pop()
@@ -170,6 +170,9 @@ def _resolve_project(project_dir: Path) -> MaturinProject:
         msg = "no pyproject.toml found"
         raise _ProjectResolveError(msg)
     pyproject = _TomlFile.load(pyproject_path)
+    if not _is_valid_pyproject(pyproject):
+        msg = "pyproject.toml is invalid (does not have required fields)"
+        raise _ProjectResolveError(msg)
 
     manifest_path = find_cargo_manifest(project_dir)
     if manifest_path is None:
@@ -203,6 +206,13 @@ def _resolve_project(project_dir: Path) -> MaturinProject:
     )
 
 
+def _is_valid_pyproject(pyproject: _TomlFile) -> bool:
+    """in maturin serde is used to load into a `PyProjectToml` struct.
+    This function should match whether the toml would parse correctly"""
+    # it should be sufficient to check the required fields rather than match the serde parsing logic exactly
+    return pyproject.get_value(["build-system", "requires"], list) is not None
+
+
 def _resolve_rust_module(python_dir: Path, module_name: str) -> tuple[Path, Path, str]:
     """This follows the same logic as project_layout.rs (ProjectLayout::determine).
 
@@ -244,7 +254,7 @@ def _resolve_module_name(pyproject: _TomlFile, cargo: _TomlFile) -> Optional[str
 
 
 def _get_immediate_path_dependencies(manifest_dir_path: Path, cargo: _TomlFile) -> list[Path]:
-    path_dependencies = []
+    path_dependencies: list[Path] = []
     for dependency in cargo.get_value_or_default(["dependencies"], dict, {}).values():
         if isinstance(dependency, dict):
             relative_path: Any = dependency.get("path", None)

src/maturin_import_hook/project_importer.py

@@ -172,6 +172,8 @@ def find_spec(
                 logger.info('rebuilt and loaded package "%s" in %.3fs', package_name, duration)
             else:
                 logger.debug('loaded package "%s" in %.3fs', package_name, duration)
+        elif logger.isEnabledFor(logging.DEBUG):
+            logger.debug('%s did not find "%s"', type(self).__name__, package_name)
         return spec
 
     def _handle_reload(self, package_name: str, spec: ModuleSpec) -> ModuleSpec:

src/maturin_import_hook/rust_file_importer.py

@@ -144,6 +144,8 @@ def find_spec(
                 logger.info('rebuilt and loaded module "%s" in %.3fs', fullname, duration)
             else:
                 logger.debug('loaded module "%s" in %.3fs', fullname, duration)
+        elif logger.isEnabledFor(logging.DEBUG):
+            logger.debug('%s did not find "%s"', type(self).__name__, fullname)
 
         return spec
 

tests/README.md

@@ -34,7 +34,7 @@ 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 installed by the maturin ci
-  (see `pip install` commands in `maturin/.github/workflows/test.yml`)
+  (see `pip` and `uv` commands in `maturin/.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.

tests/package_resolver/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.93"
 maturin = { path = "../maturin" }
 serde = { version = "1.0.195", features = ["derive"] }
-serde_json = "1.0.111"
+serde_json = "1.0.133"

tests/package_resolver/src/main.rs

@@ -32,7 +32,7 @@ fn resolve_package(project_root: &Path) -> Result<Value> {
     let _cwd = TemporaryChdir::chdir(&project_root)?;
 
     let build_options: BuildOptions = Default::default();
-    let build_context = build_options.into_build_context(false, false, false)?;
+    let build_context = build_options.into_build_context().build()?;
     let extension_module_dir = if build_context.project_layout.python_module.is_some() {
         Some(relative_path(
             &build_context.project_layout.rust_module,
@@ -74,7 +74,16 @@ fn resolve_all_packages(test_crates_dir: &Path) -> Result<Value> {
     for path in entries {
         if path.join("pyproject.toml").exists() {
             let project_name = path.file_name().unwrap().to_str().unwrap().to_owned();
-            resolved_packages.insert(project_name, resolve_package(&path).unwrap_or(Value::Null));
+            println!("resolve '{}'", project_name);
+            match resolve_package(&path) {
+                Ok(value) => {
+                    resolved_packages.insert(project_name, value);
+                }
+                Err(err) => {
+                    println!("resolve failed with: {:?}", err);
+                    resolved_packages.insert(project_name, Value::Null);
+                }
+            }
         }
     }
     Ok(Value::Object(resolved_packages))

tests/requirements.txt

@@ -1,6 +1,6 @@
 -e ..
 uv
-maturin==1.7.4
+maturin==1.7.6
 pytest
 junit2html
 uniffi-bindgen==0.28.0

tests/resolved.json

@@ -1,5 +1,5 @@
 {
-  "commit": "aebadedec43a92a1ba0fe94980c84f37122aa5b3",
+  "commit": "d896c62f31ded33adca2f58819913e29b7950299",
   "crates": {
     "cffi-mixed": {
       "cargo_manifest_path": "Cargo.toml",
@@ -155,6 +155,7 @@
       "python_dir": ".",
       "python_module": null
     },
+    "workspace-inverted-order": null,
     "wrong-python-source": {
       "cargo_manifest_path": "Cargo.toml",
       "extension_module_dir": null,