upgrade python and linters (PR 1/3) (#32)

* upgrade python and linters

* update test matrix

* remove python 3.14 since pyo3 used by maturin doesn't support that

Author: mbway

.github/workflows/test.yml

@@ -20,11 +20,10 @@ on:
         default: '3.13'
         options:
         - 'all'
-        - '3.9'
+        - '3.11'
         - '3.13t'
         - '3.13'
-        - 'pypy3.9'
-        - 'pypy3.10'
+        - 'pypy3.11'
       test_specification:
         type: string
         description: Specification for the tests to run
@@ -57,11 +56,10 @@ jobs:
         - macos-14
         - windows-latest
       PYTHON_VERSION: |
-        - '3.9'
+        - '3.11'
         - '3.13t'
         - '3.13'
-        - 'pypy3.9'
-        - 'pypy3.10'
+        - 'pypy3.11'
     steps:
       - uses: actions/setup-node@v4
         with:

.pre-commit-config.yaml

@@ -1,31 +1,31 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-yaml
       - id: check-toml
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.13
+    rev: v0.15.21
     hooks:
       - id: ruff-format
       - id: ruff
         args: [ --fix ]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.0
+    rev: v2.2.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.4.1
+    rev: v2.4.2
     hooks:
     - id: codespell
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.45.0
+    rev: v0.49.0
     hooks:
     - id: markdownlint-fix

pyproject.toml

@@ -6,10 +6,9 @@ authors = [
 ]
 readme = "README.md"
 version = "0.3.0"
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 dependencies = [
     "filelock",
-    "tomli>=1.1.0 ; python_version<'3.11'"
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -28,12 +27,17 @@ Repository = "https://github.com/PyO3/maturin-import-hook.git"
 Issues = "https://github.com/PyO3/maturin-import-hook/issues"
 Changelog = "https://github.com/PyO3/maturin-import-hook/blob/main/Changelog.md"
 
+[dependency-groups]
+dev = [
+    "pytest>=8.4.2",
+]
+
 [tool.setuptools.packages.find]
 where = ["src"]
 
 [tool.ruff]
 line-length = 120
-target-version = "py39"
+target-version = "py311"
 
 [tool.ruff.format]
 preview = true
@@ -69,7 +73,7 @@ ignore = [
 ]
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.11"
 strict = true
 allow_redefinition = true
 exclude = [

src/maturin_import_hook/__init__.py

@@ -1,6 +1,5 @@
 import os
 from pathlib import Path
-from typing import Optional
 
 from maturin_import_hook import project_importer, rust_file_importer
 from maturin_import_hook._logging import logger, reset_logger
@@ -14,12 +13,12 @@ def install(
     enable_project_importer: bool = True,
     enable_rs_file_importer: bool = True,
     enable_reloading: bool = True,
-    settings: Optional[MaturinSettings] = None,
-    build_dir: Optional[Path] = None,
+    settings: MaturinSettings | None = None,
+    build_dir: Path | None = None,
     force_rebuild: bool = False,
-    lock_timeout_seconds: Optional[float] = 120,
+    lock_timeout_seconds: float | None = 120,
     show_warnings: bool = True,
-    file_searcher: Optional[project_importer.ProjectFileSearcher] = None,
+    file_searcher: project_importer.ProjectFileSearcher | None = None,
     enable_automatic_installation: bool = False,
 ) -> None:
     """Install import hooks for automatically rebuilding and importing maturin projects or .rs files.

src/maturin_import_hook/__main__.py

@@ -6,7 +6,6 @@
 import site
 import subprocess
 from pathlib import Path
-from typing import Optional
 
 from maturin_import_hook import project_importer, rust_file_importer
 from maturin_import_hook._building import get_default_build_dir
@@ -106,7 +105,7 @@ def _action_site_install(
     *,
     user: bool,
     force: bool,
-    args: Optional[str],
+    args: str | None,
     enable_project_importer: bool,
     enable_rs_file_importer: bool,
 ) -> None:

src/maturin_import_hook/_building.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import hashlib
 import json
 import logging
@@ -8,18 +10,21 @@
 import subprocess
 import sys
 import zipfile
-from collections.abc import Generator, Iterable
 from contextlib import contextmanager
 from dataclasses import dataclass
 from operator import itemgetter
 from pathlib import Path
-from typing import Any, Optional
+from typing import TYPE_CHECKING, Any
 
 import filelock
 
 from maturin_import_hook._logging import logger
 from maturin_import_hook.error import ImportHookError, MaturinError
-from maturin_import_hook.settings import MaturinSettings
+
+if TYPE_CHECKING:
+    from collections.abc import Generator, Iterable
+
+    from maturin_import_hook.settings import MaturinSettings
 
 
 @dataclass
@@ -43,7 +48,7 @@ def to_json(self) -> dict[str, Any]:
         }
 
     @staticmethod
-    def from_json(json_data: dict[Any, Any]) -> Optional["BuildStatus"]:
+    def from_json(json_data: dict[Any, Any]) -> BuildStatus | None:
         try:
             return BuildStatus(
                 build_mtime=json_data["build_mtime"],
@@ -70,7 +75,7 @@ def store_build_status(self, build_status: BuildStatus) -> None:
         with self._build_status_path(build_status.source_path).open("w") as f:
             json.dump(build_status.to_json(), f, indent="  ")
 
-    def get_build_status(self, source_path: Path) -> Optional[BuildStatus]:
+    def get_build_status(self, source_path: Path) -> BuildStatus | None:
         try:
             with self._build_status_path(source_path).open("r") as f:
                 return BuildStatus.from_json(json.load(f))
@@ -83,7 +88,7 @@ def tmp_project_dir(self, project_path: Path, module_name: str) -> Path:
 
 
 class BuildCache:
-    def __init__(self, build_dir: Optional[Path], lock_timeout_seconds: Optional[float]) -> None:
+    def __init__(self, build_dir: Path | None, lock_timeout_seconds: float | None) -> None:
         self._build_dir = build_dir if build_dir is not None else get_default_build_dir()
         self._lock = filelock.FileLock(
             self._build_dir / "lock", timeout=-1 if lock_timeout_seconds is None else lock_timeout_seconds
@@ -96,7 +101,7 @@ def lock(self) -> Generator[LockedBuildCache, None, None]:
 
 
 @contextmanager
-def _acquire_lock(lock: filelock.FileLock) -> Generator[None, None, None]:
+def _acquire_lock(lock: filelock.BaseFileLock) -> Generator[None, None, None]:
     try:
         try:
             with lock.acquire(blocking=False):
@@ -245,7 +250,7 @@ def build_unpacked_wheel(maturin_path: Path, manifest_path: Path, output_dir: Pa
     return output
 
 
-def _find_single_file(dir_path: Path, extension: Optional[str]) -> Optional[Path]:
+def _find_single_file(dir_path: Path, extension: str | None) -> Path | None:
     if dir_path.exists():
         candidate_files = [p for p in dir_path.iterdir() if extension is None or p.suffix == extension]
     else:
@@ -261,8 +266,8 @@ def maturin_output_has_warnings(output: str) -> bool:
 class Freshness:
     is_fresh: bool
     reason: str
-    oldest_installed_path: Optional[Path]
-    newest_source_path: Optional[Path]
+    oldest_installed_path: Path | None
+    newest_source_path: Path | None
 
 
 def get_installation_freshness(
@@ -326,7 +331,7 @@ def get_installation_freshness(
         return Freshness(True, "", oldest_installed_path, newest_source_path)
 
 
-def get_installation_mtime(installed_paths: Iterable[Path]) -> Optional[float]:
+def get_installation_mtime(installed_paths: Iterable[Path]) -> float | None:
     try:
         installation_mtime = min(path.stat().st_mtime for path in installed_paths)
     except ValueError:

src/maturin_import_hook/_common.py

@@ -2,7 +2,6 @@
 import shutil
 import tempfile
 from pathlib import Path
-from typing import Optional
 
 from maturin_import_hook._logging import logger
 
@@ -12,7 +11,7 @@ class LazySessionTemporaryDirectory:
 
     def __init__(self, *, prefix: str) -> None:
         self._prefix = prefix
-        self._tmp_path: Optional[Path] = None
+        self._tmp_path: Path | None = None
 
     def __del__(self) -> None:
         self._cleanup()

src/maturin_import_hook/_resolve_project.py

@@ -1,16 +1,11 @@
 import itertools
+import tomllib
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Optional, TypeVar
 
 from maturin_import_hook._logging import logger
 
-try:
-    import tomllib
-except ModuleNotFoundError:
-    import tomli as tomllib
-
-
 _T = TypeVar("_T")
 
 
@@ -33,7 +28,7 @@ def get_value_or_default(self, keys: list[str], required_type: type[_T], default
         value = self.get_value(keys, required_type)
         return default if value is None else value
 
-    def get_value(self, keys: list[str], required_type: type[_T]) -> Optional[_T]:
+    def get_value(self, keys: list[str], required_type: type[_T]) -> _T | None:
         assert keys
         current_data: Any = self.data
         num_keys = len(keys)
@@ -58,7 +53,7 @@ def get_value(self, keys: list[str], required_type: type[_T]) -> Optional[_T]:
             return current_data
 
 
-def find_cargo_manifest(project_dir: Path) -> Optional[Path]:
+def find_cargo_manifest(project_dir: Path) -> Path | None:
     pyproject_path = project_dir / "pyproject.toml"
     if pyproject_path.is_file():
         pyproject_data = pyproject_path.read_text()
@@ -88,7 +83,7 @@ def is_maybe_maturin_project(directory: Path) -> bool:
 
 class ProjectResolver:
     def __init__(self) -> None:
-        self._resolved_project_cache: dict[Path, Optional[MaturinProject]] = {}
+        self._resolved_project_cache: dict[Path, MaturinProject | None] = {}
 
     def clear_cache(self) -> None:
         self._resolved_project_cache.clear()
@@ -115,13 +110,13 @@ class MaturinProject:
     # the root of the python part of the project (or the project root if there is none)
     python_dir: Path
     # the path to the top level python package if the project is mixed
-    python_module: Optional[Path]
+    python_module: Path | None
     # the location that the compiled extension module is written to when installed in editable/unpacked mode
-    extension_module_dir: Optional[Path]
+    extension_module_dir: Path | None
     # path dependencies listed in the Cargo.toml of the main project
     immediate_path_dependencies: list[Path]
     # all path dependencies including transitive dependencies
-    _all_path_dependencies: Optional[list[Path]] = None
+    _all_path_dependencies: list[Path] | None = None
 
     @property
     def package_name(self) -> str:
@@ -204,8 +199,8 @@ def _resolve_project(project_dir: Path) -> MaturinProject:
 
     python_dir = _resolve_py_root(project_dir, pyproject)
 
-    extension_module_dir: Optional[Path]
-    python_module: Optional[Path]
+    extension_module_dir: Path | None
+    python_module: Path | None
     python_module, extension_module_dir, _extension_module_name = _resolve_rust_module(python_dir, module_full_name)
     immediate_path_dependencies = _get_immediate_path_dependencies(manifest_path.parent, cargo)
 
@@ -248,7 +243,7 @@ def _resolve_rust_module(python_dir: Path, module_name: str) -> tuple[Path, Path
     return python_module, extension_module_dir, extension_module_name
 
 
-def _resolve_module_name(pyproject: _TomlFile, cargo: _TomlFile) -> Optional[str]:
+def _resolve_module_name(pyproject: _TomlFile, cargo: _TomlFile) -> str | None:
     """This follows the same logic as project_layout.rs (ProjectResolver::resolve).
 
     Precedence:

src/maturin_import_hook/_site.py

@@ -2,7 +2,6 @@
 import shlex
 import site
 from pathlib import Path
-from typing import Optional
 
 from maturin_import_hook._logging import logger
 from maturin_import_hook.settings import MaturinSettings
@@ -85,7 +84,7 @@ def insert_automatic_installation(
     module_path: Path,
     uninstall_command: str,
     force: bool,
-    args: Optional[str],
+    args: str | None,
     enable_project_importer: bool,
     enable_rs_file_importer: bool,
 ) -> None: