pre-commit-uv 4.2.0__tar.gz → 4.2.2__tar.gz

{pre_commit_uv-4.2.0 → pre_commit_uv-4.2.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: pre-commit-uv
-Version: 4.2.0
+Version: 4.2.2
 Summary: Run pre-commit with uv
 Project-URL: Bug Tracker, https://github.com/tox-dev/pre-commit-uv/issues
+Project-URL: Source Code, https://github.com/tox-dev/pre-commit-uv
 Project-URL: Changelog, https://github.com/tox-dev/pre-commit-uv/releases
 Project-URL: Documentation, https://github.com/tox-dev/pre-commit-uv/
-Project-URL: Source Code, https://github.com/tox-dev/pre-commit-uv
 Author-email: Bernat Gabor <gaborjbernat@gmail.com>
 License: Permission is hereby granted, free of charge, to any person obtaining a
         copy of this software and associated documentation files (the
@@ -39,11 +39,6 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Requires-Dist: pre-commit>=4.3
 Requires-Dist: uv>=0.9.1
-Provides-Extra: testing
-Requires-Dist: covdefaults>=2.3; extra == 'testing'
-Requires-Dist: pytest-cov>=7; extra == 'testing'
-Requires-Dist: pytest-mock>=3.15.1; extra == 'testing'
-Requires-Dist: pytest>=8.4.2; extra == 'testing'
 Description-Content-Type: text/markdown
 
 # pre-commit-uv

{pre_commit_uv-4.2.0 → pre_commit_uv-4.2.2}/pyproject.toml

@@ -2,7 +2,7 @@
 build-backend = "hatchling.build"
 requires = [
   "hatch-vcs>=0.5",
-  "hatchling>=1.27",
+  "hatchling>=1.28",
 ]
 
 [project]
@@ -36,18 +36,39 @@ dependencies = [
   "pre-commit>=4.3",
   "uv>=0.9.1",
 ]
-optional-dependencies.testing = [
+urls."Bug Tracker" = "https://github.com/tox-dev/pre-commit-uv/issues"
+urls."Source Code" = "https://github.com/tox-dev/pre-commit-uv"
+urls.Changelog = "https://github.com/tox-dev/pre-commit-uv/releases"
+urls.Documentation = "https://github.com/tox-dev/pre-commit-uv/"
+
+[dependency-groups]
+dev = [
+  { include-group = "lint" },
+  { include-group = "pkg-meta" },
+  { include-group = "test" },
+  { include-group = "type" },
+]
+test = [
   "covdefaults>=2.3",
   "pytest>=8.4.2",
   "pytest-cov>=7",
   "pytest-mock>=3.15.1",
 ]
-urls."Bug Tracker" = "https://github.com/tox-dev/pre-commit-uv/issues"
-urls."Changelog" = "https://github.com/tox-dev/pre-commit-uv/releases"
-urls.Documentation = "https://github.com/tox-dev/pre-commit-uv/"
-urls."Source Code" = "https://github.com/tox-dev/pre-commit-uv"
+type = [
+  "ty>=0.0.17",
+  { include-group = "test" },
+]
+lint = [
+  "pre-commit-uv>=4.2",
+]
+pkg-meta = [
+  "check-wheel-contents>=0.6.3",
+  "twine>=6.2",
+  "uv>=0.10.2",
+]
 
 [tool.hatch]
+version.source = "vcs"
 build.dev-mode-dirs = [
   "src",
 ]
@@ -58,7 +79,6 @@ build.targets.sdist.include = [
 ]
 build.targets.wheel.only-include = [ "src" ]
 build.targets.wheel.sources = [ "src" ]
-version.source = "vcs"
 
 [tool.ruff]
 line-length = 120
@@ -69,7 +89,6 @@ lint.select = [
   "ALL",
 ]
 lint.ignore = [
-  "ANN101", # no type annotation for self
   "ANN401", # allow Any as type annotation
   "COM812", # Conflict with formatter
   "CPY",    # No copyright statements
@@ -77,6 +96,7 @@ lint.ignore = [
   "D212",   # `multi-line-summary-first-line` (D212) and `multi-line-summary-second-line` (D213) are incompatible
   "DOC501", # not working with Sphinx
   "ISC001", # Conflict with formatter
+  "RUF067", # `__init__` module should only contain docstrings and re-exports
   "S104",   # Possible binding to all interfaces
 ]
 lint.per-file-ignores."tests/**/*.py" = [
@@ -104,14 +124,19 @@ count = true
 [tool.pyproject-fmt]
 max_supported_python = "3.14"
 
+[tool.ty]
+environment.python-version = "3.14"
+
 [tool.pytest]
 ini_options.testpaths = [
   "tests",
 ]
 
 [tool.coverage]
-html.show_contexts = true
-html.skip_covered = false
+run.parallel = true
+run.plugins = [
+  "covdefaults",
+]
 paths.source = [
   "src",
   ".tox/*/.venv/lib/*/site-packages",
@@ -122,16 +147,5 @@ paths.source = [
   "**\\src",
 ]
 report.fail_under = 63
-run.parallel = true
-run.plugins = [
-  "covdefaults",
-]
-
-[tool.mypy]
-show_error_codes = true
-strict = true
-overrides = [
-  { module = [
-    "pre_commit.*",
-  ], ignore_missing_imports = true },
-]
+html.show_contexts = true
+html.skip_covered = false

pre_commit_uv-4.2.2/src/pre_commit_uv/__init__.py

@@ -0,0 +1,174 @@
+"""Package root."""
+
+from __future__ import annotations
+
+# only import built-ins at top level to avoid interpreter startup overhead
+import os
+import pathlib
+import sys
+from typing import TYPE_CHECKING, cast
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Sequence
+    from typing import Protocol
+
+    from pre_commit.prefix import Prefix
+
+    class _PatchablePython(Protocol):
+        install_environment: Callable[[Prefix, str, Sequence[str]], None]
+        health_check: Callable[[Prefix, str], str | None]
+
+
+_original_main = None
+
+
+def _is_calling_pre_commit() -> bool:
+    if "FORCE_PRE_COMMIT_UV_PATCH" in os.environ:
+        return True
+    if not sys.argv or not sys.argv[0]:
+        return False
+    # case when pre-commit is called via python -m pre_commit
+    if sys.argv[0] == "-m" and "-m" in sys.orig_argv and "pre_commit" in sys.orig_argv:
+        return True
+    calling = sys.argv[1] if sys.argv[0] == sys.executable and len(sys.argv) >= 1 else sys.argv[0]
+    # case when pre-commit is called directly
+    if os.path.split(calling)[1] == f"pre-commit{'.exe' if sys.platform == 'win32' else ''}":
+        return True
+    # case when pre-commit is called due to a git commit
+    return "-m" in sys.argv and "hook-impl" in sys.argv
+
+
+def _patch() -> None:
+    global _original_main
+    if _original_main is not None:  # already patched, nothing more to do
+        return
+
+    if _is_calling_pre_commit() and os.environ.get("DISABLE_PRE_COMMIT_UV_PATCH") is None:
+        from pre_commit import main  # noqa: PLC0415
+
+        _original_main, main.main = main.main, _new_main  # ty: ignore[invalid-assignment]
+        if "--version" in sys.argv:
+            from importlib.metadata import version as _metadata_version  # noqa: PLC0415
+
+            from pre_commit import constants  # noqa: PLC0415
+
+            constants.VERSION = (
+                f"{constants.VERSION} ("
+                f"pre-commit-uv={_metadata_version('pre-commit-uv')}, "
+                f"uv={_metadata_version('uv')}"
+                f")"
+            )
+
+
+def _new_main(argv: Sequence[str] | None = None) -> int:
+    # imports applied locally to avoid patching import overhead cost
+    from functools import cache  # noqa: PLC0415
+
+    from pre_commit.languages import python  # noqa: PLC0415
+
+    def _install_environment(
+        prefix: Prefix,
+        version: str,
+        additional_dependencies: Sequence[str],
+    ) -> None:
+        import logging  # noqa: PLC0415
+
+        from pre_commit.git import get_root  # noqa: PLC0415
+        from pre_commit.lang_base import environment_dir, setup_cmd  # noqa: PLC0415
+        from pre_commit.util import cmd_output_b  # noqa: PLC0415
+
+        project_root_dir = get_root()
+
+        logger = logging.getLogger("pre_commit")
+        logger.info("Using pre-commit with uv %s via pre-commit-uv %s", uv_version(), self_version())
+        uv = _uv()
+        py = python.norm_version(version) or os.environ.get("UV_PYTHON", sys.executable)
+        venv_cmd = [
+            uv,
+            "--project",
+            project_root_dir,
+            "venv",
+            "--seed",
+            environment_dir(prefix, python.ENVIRONMENT_DIR, version),
+            "-p",
+            py,
+        ]
+        cmd_output_b(*venv_cmd, cwd="/")
+
+        with python.in_env(prefix, version):
+            setup_cmd(
+                prefix,
+                (
+                    uv,
+                    "--project",
+                    project_root_dir,
+                    "pip",
+                    "install",
+                    ".",
+                    *additional_dependencies,
+                ),
+            )
+
+    @cache
+    def _uv() -> str:
+        from uv import find_uv_bin  # noqa: PLC0415
+
+        return find_uv_bin()
+
+    @cache
+    def self_version() -> str:
+        from importlib.metadata import version as _metadata_version  # noqa: PLC0415
+
+        return _metadata_version("pre-commit-uv")
+
+    @cache
+    def uv_version() -> str:
+        from importlib.metadata import version as _metadata_version  # noqa: PLC0415
+
+        return _metadata_version("uv")
+
+    patched = cast("_PatchablePython", python)
+    patched.install_environment = _install_environment
+    patched.health_check = _health_check
+    assert _original_main is not None  # noqa: S101
+    return _original_main(argv)
+
+
+def _version_info(exe: str) -> str:
+    from pre_commit.util import CalledProcessError, cmd_output  # noqa: PLC0415
+
+    prog = 'import sys;print(".".join(str(p) for p in sys.version_info[0:3]))'
+    try:
+        return cmd_output(exe, "-S", "-c", prog)[1].strip()
+    except CalledProcessError:
+        return f"<<error retrieving version from {exe}>>"
+
+
+def _health_check(prefix: Prefix, version: str) -> str | None:
+    # uv may record fewer version components in pyvenv.cfg than pre-commit expects (e.g. "3.14" vs "3.14.6"),
+    # so compare only the components uv actually wrote rather than requiring an exact string match
+    from pre_commit.lang_base import environment_dir  # noqa: PLC0415
+    from pre_commit.languages import python  # noqa: PLC0415
+    from pre_commit.util import win_exe  # noqa: PLC0415
+
+    pyvenv_cfg = pathlib.Path(environment_dir(prefix, python.ENVIRONMENT_DIR, version)) / "pyvenv.cfg"
+    if not pyvenv_cfg.exists():
+        return "pyvenv.cfg does not exist (old virtualenv?)"
+
+    cfg = python._read_pyvenv_cfg(str(pyvenv_cfg))  # noqa: SLF001
+    if "version_info" not in cfg:
+        return "created virtualenv's pyvenv.cfg is missing `version_info`"
+    expected = cfg["version_info"].split(".")
+
+    py_exe = prefix.path(python.bin_dir(str(pyvenv_cfg.parent)), win_exe("python"))
+    targets = [("virtualenv python", py_exe)]
+    if "base-executable" in cfg:
+        targets.append(("base executable", cfg["base-executable"]))
+    for label, exe in targets:
+        if (actual := _version_info(exe)).split(".")[: len(expected)] != expected:
+            return (
+                f"{label} version did not match created version:\n"
+                f"- actual version: {actual}\n"
+                f"- expected version: {cfg['version_info']}\n"
+            )
+    return None

pre_commit_uv-4.2.2/tests/test_health_check.py

@@ -0,0 +1,77 @@
+from __future__ import annotations
+
+import sys
+from typing import TYPE_CHECKING
+
+from pre_commit.languages import python
+from pre_commit.prefix import Prefix
+
+from pre_commit_uv import _health_check
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+version = "default"
+major_minor = f"{sys.version_info[0]}.{sys.version_info[1]}"
+full_version = ".".join(str(p) for p in sys.version_info[0:3])
+wrong_version = f"{sys.version_info[0]}.{sys.version_info[1] + 1}"
+
+
+def _make_env(tmp_path: Path, pyvenv_cfg: str | None) -> Prefix:
+    envdir = tmp_path / f"py_env-{version}"
+    bin_dir = python.bin_dir(str(envdir))
+    (tmp_path / bin_dir).mkdir(parents=True)
+    (tmp_path / bin_dir / python.win_exe("python")).symlink_to(sys.executable)
+    if pyvenv_cfg is not None:
+        (envdir / "pyvenv.cfg").write_text(pyvenv_cfg)
+    return Prefix(str(tmp_path))
+
+
+def test_health_check_truncated_version_passes(tmp_path: Path) -> None:
+    """uv >=0.11.22 writes only the major.minor into pyvenv.cfg (see issue #152)."""
+    prefix = _make_env(tmp_path, f"version_info = {major_minor}\nbase-executable = {sys.executable}\n")
+
+    assert _health_check(prefix, version) is None
+
+
+def test_health_check_full_version_passes(tmp_path: Path) -> None:
+    prefix = _make_env(tmp_path, f"version_info = {full_version}\nbase-executable = {sys.executable}\n")
+
+    assert _health_check(prefix, version) is None
+
+
+def test_health_check_no_base_executable_passes(tmp_path: Path) -> None:
+    prefix = _make_env(tmp_path, f"version_info = {major_minor}\n")
+
+    assert _health_check(prefix, version) is None
+
+
+def test_health_check_version_mismatch_fails(tmp_path: Path) -> None:
+    prefix = _make_env(tmp_path, f"version_info = {wrong_version}\n")
+
+    result = _health_check(prefix, version)
+
+    assert result is not None
+    assert "virtualenv python version did not match created version" in result
+    assert f"- expected version: {wrong_version}" in result
+
+
+def test_health_check_base_executable_mismatch_fails(tmp_path: Path) -> None:
+    prefix = _make_env(tmp_path, f"version_info = {major_minor}\nbase-executable = /does/not/exist/python\n")
+
+    result = _health_check(prefix, version)
+
+    assert result is not None
+    assert "base executable version did not match created version" in result
+
+
+def test_health_check_missing_pyvenv_cfg(tmp_path: Path) -> None:
+    prefix = _make_env(tmp_path, None)
+
+    assert _health_check(prefix, version) == "pyvenv.cfg does not exist (old virtualenv?)"
+
+
+def test_health_check_missing_version_info(tmp_path: Path) -> None:
+    prefix = _make_env(tmp_path, "home = /usr\n")
+
+    assert _health_check(prefix, version) == "created virtualenv's pyvenv.cfg is missing `version_info`"

{pre_commit_uv-4.2.0 → pre_commit_uv-4.2.2}/tests/test_main.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 from importlib.metadata import version
 from subprocess import check_call, check_output
 from textwrap import dedent
@@ -47,8 +48,8 @@ def test_run_precommit_hook() -> None:
 
 @pytest.mark.usefixtures("install_hook")
 def test_call_as_module() -> None:
-    run_result = check_output(["python3", "-m", "pre_commit", "run", "-a", "--color", "never"], encoding="utf-8")
-    assert f"[INFO] Using pre-commit with uv {uv} via pre-commit-uv {self}" not in run_result.splitlines()
+    run_result = check_output([sys.executable, "-m", "pre_commit", "run", "-a", "--color", "never"], encoding="utf-8")
+    assert f"[INFO] Using pre-commit with uv {uv} via pre-commit-uv {self}" in run_result.splitlines()
 
 
 def test_install(git_repo: Path, caplog: pytest.LogCaptureFixture, monkeypatch: pytest.MonkeyPatch) -> None:
@@ -68,6 +69,21 @@ def test_install(git_repo: Path, caplog: pytest.LogCaptureFixture, monkeypatch:
     ]
 
 
+def test_install_seeds_pip(git_repo: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setenv("FORCE_PRE_COMMIT_UV_PATCH", "1")
+
+    import pre_commit_uv  # noqa: PLC0415
+
+    pre_commit_uv._patch()  # noqa: SLF001
+    main.main(["install-hooks", "-c", str(git_repo / precommit_file)])
+
+    env_dirs = list((git_repo / "store").rglob("py_env-*"))
+    assert env_dirs, "expected at least one hook environment"
+    py = next((env_dirs[0] / "bin").glob("python*"))
+    result = check_output([str(py), "-c", "import pip"], encoding="utf-8")
+    assert not result
+
+
 test_install_with_uv_config_cases: list[tuple[str, str]] = [
     (
         "pyproject.toml",

pre_commit_uv-4.2.0/src/pre_commit_uv/__init__.py

@@ -1,128 +0,0 @@
-"""Package root."""
-
-from __future__ import annotations
-
-# only import built-ins at top level to avoid interpreter startup overhead
-import os
-import sys
-
-_original_main = None
-
-
-def _patch() -> None:
-    global _original_main
-    if _original_main is not None:  # already patched, nothing more to do
-        return
-    calling_pre_commit = "FORCE_PRE_COMMIT_UV_PATCH" in os.environ
-    if not calling_pre_commit and sys.argv and sys.argv[0]:  # must have arguments
-        calling = sys.argv[1] if sys.argv[0] == sys.executable and len(sys.argv) >= 1 else sys.argv[0]
-        if (
-            os.path.split(calling)[1] == f"pre-commit{'.exe' if sys.platform == 'win32' else ''}"
-            # case when pre-commit is called due to a git commit
-            or ("-m" in sys.argv and "hook-impl" in sys.argv)
-        ):
-            calling_pre_commit = True
-
-    if calling_pre_commit and os.environ.get("DISABLE_PRE_COMMIT_UV_PATCH") is None:
-        from pre_commit import main  # noqa: PLC0415
-
-        _original_main, main.main = main.main, _new_main
-        if "--version" in sys.argv:
-            from importlib.metadata import version as _metadata_version  # noqa: PLC0415
-
-            from pre_commit import constants  # noqa: PLC0415
-
-            constants.VERSION = (
-                f"{constants.VERSION} ("
-                f"pre-commit-uv={_metadata_version('pre-commit-uv')}, "
-                f"uv={_metadata_version('uv')}"
-                f")"
-            )
-
-
-def _new_main(argv: list[str] | None = None) -> int:
-    # imports applied locally to avoid patching import overhead cost
-    from functools import cache  # noqa: PLC0415
-    from typing import TYPE_CHECKING, cast  # noqa: PLC0415
-
-    from pre_commit.languages import python  # noqa: PLC0415
-
-    if TYPE_CHECKING:
-        from collections.abc import Sequence  # noqa: PLC0415
-
-        from pre_commit.prefix import Prefix  # noqa: PLC0415
-
-    def _install_environment(
-        prefix: Prefix,
-        version: str,
-        additional_dependencies: Sequence[str],
-    ) -> None:
-        import logging  # noqa: PLC0415
-
-        from pre_commit.git import get_root  # noqa: PLC0415
-        from pre_commit.lang_base import environment_dir, setup_cmd  # noqa: PLC0415
-        from pre_commit.util import cmd_output_b  # noqa: PLC0415
-
-        project_root_dir = get_root()
-
-        logger = logging.getLogger("pre_commit")
-        logger.info("Using pre-commit with uv %s via pre-commit-uv %s", uv_version(), self_version())
-        uv = _uv()
-        py = python.norm_version(version) or os.environ.get("UV_PYTHON", sys.executable)
-        venv_cmd = [
-            uv,
-            "--project",
-            project_root_dir,
-            "venv",
-            environment_dir(prefix, python.ENVIRONMENT_DIR, version),
-            "-p",
-            py,
-        ]
-        cmd_output_b(*venv_cmd, cwd="/")
-
-        with python.in_env(prefix, version):
-            setup_cmd(
-                prefix,
-                (
-                    uv,
-                    "--project",
-                    project_root_dir,
-                    "pip",
-                    "install",
-                    ".",
-                    *additional_dependencies,
-                ),
-            )
-
-    @cache
-    def _uv() -> str:
-        from uv import find_uv_bin  # noqa: PLC0415
-
-        return find_uv_bin()
-
-    @cache
-    def self_version() -> str:
-        from importlib.metadata import version as _metadata_version  # noqa: PLC0415
-
-        return _metadata_version("pre-commit-uv")
-
-    @cache
-    def uv_version() -> str:
-        from importlib.metadata import version as _metadata_version  # noqa: PLC0415
-
-        return _metadata_version("uv")
-
-    @cache
-    def _version_info(exe: str) -> str:
-        from pre_commit.util import CalledProcessError, cmd_output  # noqa: PLC0415
-
-        prog = 'import sys;print(".".join(str(p) for p in sys.version_info[0:3]))'
-        try:
-            return cast("str", cmd_output(exe, "-S", "-c", prog)[1].strip())
-        except CalledProcessError:
-            return f"<<error retrieving version from {exe}>>"
-
-    python.install_environment = _install_environment
-    python._version_info = _version_info  # noqa: SLF001
-    assert _original_main is not None  # noqa: S101
-    return cast("int", _original_main(argv))

pre_commit_uv-4.2.0/tox.ini

@@ -1,70 +0,0 @@
-[tox]
-requires =
-    tox>=4.31
-    tox-uv>=1.28.1
-env_list =
-    fix
-    3.14
-    3.13
-    3.12
-    3.11
-    3.10
-    3.9
-    3.8
-    type
-    pkg_meta
-skip_missing_interpreters = true
-
-[testenv]
-description = run the unit tests with pytest under {base_python}
-package = wheel
-wheel_build_env = .pkg
-extras =
-    testing
-pass_env =
-    PYTEST_*
-set_env =
-    COVERAGE_FILE = {work_dir}/.coverage.{env_name}
-commands =
-    python -m pytest {tty:--color=yes} {posargs: \
-      --cov {env_site_packages_dir}{/}pre_commit_uv --cov {tox_root}{/}tests \
-      --cov-config=pyproject.toml --no-cov-on-fail --cov-report term-missing:skip-covered --cov-context=test \
-      --cov-report html:{env_tmp_dir}{/}htmlcov --cov-report xml:{work_dir}{/}coverage.{env_name}.xml \
-      --junitxml {work_dir}{/}junit.{env_name}.xml \
-      tests}
-
-[testenv:fix]
-description = format the code base to adhere to our styles, and complain about what we cannot do automatically
-skip_install = true
-deps =
-    pre-commit-uv>=4.1.1
-commands =
-    pre-commit run --all-files --show-diff-on-failure
-
-[testenv:type]
-description = run type check on code base
-deps =
-    mypy==1.18.2
-commands =
-    mypy src
-    mypy tests
-
-[testenv:pkg_meta]
-description = check that the long description is valid
-skip_install = true
-deps =
-    check-wheel-contents>=0.6.3
-    twine>=6.2
-    uv>=0.9.1
-commands =
-    uv build --sdist --wheel --out-dir {env_tmp_dir} .
-    twine check {env_tmp_dir}{/}*
-    check-wheel-contents --no-config {env_tmp_dir}
-
-[testenv:dev]
-description = generate a DEV environment
-package = editable
-commands =
-    uv tree
-    python -c 'import sys; print(sys.executable)'
-    python task/dev_pth.py {env_site_packages_dir}