Merge branch 'main' into improve_toml_error_handling

Author: mbway

.pre-commit-config.yaml

@@ -8,24 +8,24 @@ repos:
       - id: trailing-whitespace
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.9.6
     hooks:
       - id: ruff-format
       - id: ruff
         args: [ --fix ]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.15.0
     hooks:
       # note: mypy runs in an isolated environment and so has no access to third party packages
       - id: mypy
         entry: mypy src/maturin_import_hook/ tests/test_import_hook tests/runner.py
         pass_filenames: false
         additional_dependencies: ["pytest"]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
     - id: codespell
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.44.0
     hooks:
     - id: markdownlint-fix

Changelog.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 - improve handling of TOML parsing errors
+- update to maturin 1.8.2
+    - remove `--detect-uv` argument to `maturin_import_hook site install` because maturin now automatically detects uv
+      environments
 
 ## [0.2.0]
 

pyproject.toml

@@ -43,7 +43,6 @@ select = ["ALL"]
 
 # https://docs.astral.sh/ruff/rules/
 ignore = [
-    "ANN101",  # missing-type-self
     "ARG",     # flake8-unused-arguments
     "C901",    # complex-structure
     "COM",     # flake8-commas

src/maturin_import_hook/__init__.py

@@ -6,7 +6,7 @@
 from maturin_import_hook._logging import logger, reset_logger
 from maturin_import_hook.settings import MaturinSettings
 
-__all__ = ["install", "uninstall", "reset_logger"]
+__all__ = ["install", "reset_logger", "uninstall"]
 
 
 def install(

src/maturin_import_hook/__main__.py

@@ -109,7 +109,6 @@ def _action_site_install(
     args: Optional[str],
     enable_project_importer: bool,
     enable_rs_file_importer: bool,
-    detect_uv: bool,
 ) -> None:
     if user:
         module_path = get_usercustomize_path()
@@ -124,7 +123,6 @@ def _action_site_install(
         args,
         enable_project_importer,
         enable_rs_file_importer,
-        detect_uv,
     )
 
 
@@ -219,12 +217,6 @@ def _main() -> None:
         help="Whether to enable the rs file importer",
         action=argparse.BooleanOptionalAction,
     )
-    install.add_argument(
-        "--detect-uv",
-        default=True,
-        help="Whether to automatically detect and use the --uv flag",
-        action=argparse.BooleanOptionalAction,
-    )
     install.add_argument(
         "--args",
         help="The arguments to pass to `maturin`. See `maturin develop --help` or `maturin build --help`",
@@ -273,7 +265,6 @@ def _main() -> None:
                 args=args.args,
                 enable_project_importer=args.project_importer,
                 enable_rs_file_importer=args.rs_file_importer,
-                detect_uv=args.detect_uv,
             )
         elif args.sub_action == "uninstall":
             _action_site_uninstall(user=args.user)

src/maturin_import_hook/_site.py

@@ -1,7 +1,5 @@
 import dataclasses
-import importlib
 import shlex
-import shutil
 import site
 from pathlib import Path
 from typing import Optional
@@ -83,45 +81,20 @@ def remove_automatic_installation(module_path: Path) -> None:
         module_path.unlink(missing_ok=True)
 
 
-def _should_use_uv() -> bool:
-    """Whether the `--uv` flag should be used when installing into this environment.
-
-    virtual environments managed with `uv` do not have `pip` installed so the `--uv` flag is required.
-    """
-    try:
-        importlib.import_module("pip")
-    except ModuleNotFoundError:
-        if shutil.which("uv") is not None:
-            return True
-        else:
-            logger.warning("neither `pip` nor `uv` were found. `maturin develop` may not work...")
-            return False
-    else:
-        # since pip is a more established program, use it even if uv may be installed
-        return False
-
-
 def insert_automatic_installation(
     module_path: Path,
     uninstall_command: str,
     force: bool,
     args: Optional[str],
     enable_project_importer: bool,
     enable_rs_file_importer: bool,
-    detect_uv: bool,
 ) -> None:
     if args is None:
         parsed_args = MaturinSettings.default()
     else:
         parsed_args = MaturinSettings.from_args(shlex.split(args))
         if parsed_args.color is None:
             parsed_args.color = True
-    if detect_uv and not parsed_args.uv and _should_use_uv():
-        parsed_args.uv = True
-        logger.info(
-            "using `--uv` flag as it was detected to be necessary for this environment. "
-            "Use `site install --no-detect-uv` to set manually."
-        )
 
     logger.info(f"installing automatic activation into '{module_path}'")
     if has_automatic_installation(module_path):

src/maturin_import_hook/project_importer.py

@@ -41,12 +41,12 @@
 from maturin_import_hook.settings import MaturinSettings
 
 __all__ = [
+    "IMPORTER",
+    "DefaultProjectFileSearcher",
     "MaturinProjectImporter",
+    "ProjectFileSearcher",
     "install",
     "uninstall",
-    "IMPORTER",
-    "ProjectFileSearcher",
-    "DefaultProjectFileSearcher",
 ]
 
 

src/maturin_import_hook/rust_file_importer.py

@@ -31,7 +31,7 @@
 from maturin_import_hook.error import ImportHookError
 from maturin_import_hook.settings import MaturinSettings
 
-__all__ = ["MaturinRustFileImporter", "install", "uninstall", "IMPORTER"]
+__all__ = ["IMPORTER", "MaturinRustFileImporter", "install", "uninstall"]
 
 
 class MaturinRustFileImporter(importlib.abc.MetaPathFinder):

src/maturin_import_hook/settings.py

@@ -184,7 +184,7 @@ def error(self, message: str) -> None:  # type: ignore[override]
     def exit(self, status: int = 0, message: Optional[str] = None) -> None:  # type: ignore[override]
         pass
 
-    def _print_message(self, message: str, file: Optional[IO[str]] = None) -> None:
+    def _print_message(self, message: str, file: Optional[IO[str]] = None) -> None:  # type: ignore[override]
         pass