pre-commit-uv 4.1.2__tar.gz → 4.1.4__tar.gz

{pre_commit_uv-4.1.2 → pre_commit_uv-4.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pre-commit-uv
-Version: 4.1.2
+Version: 4.1.4
 Summary: Run pre-commit with uv
 Project-URL: Bug Tracker, https://github.com/tox-dev/pre-commit-uv/issues
 Project-URL: Changelog, https://github.com/tox-dev/pre-commit-uv/releases

{pre_commit_uv-4.1.2 → pre_commit_uv-4.1.4}/src/pre_commit_uv/__init__.py

@@ -16,7 +16,11 @@ def _patch() -> None:
     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 ''}":
+        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:
@@ -61,13 +65,9 @@ def _new_main(argv: list[str] | None = None) -> int:
         logger = logging.getLogger("pre_commit")
         logger.info("Using pre-commit with uv %s via pre-commit-uv %s", uv_version(), self_version())
         uv = _uv()
-        venv_cmd = [uv, "venv", environment_dir(prefix, python.ENVIRONMENT_DIR, version)]
-        py = python.norm_version(version)
-        if py is not None:
-            venv_cmd.extend(("-p", py))
-        env = os.environ.copy()
-        env["UV_INTERNAL__PARENT_INTERPRETER"] = sys.executable
-        cmd_output_b(*venv_cmd, cwd="/", env=env)
+        py = python.norm_version(version) or os.environ.get("UV_PYTHON", sys.executable)
+        venv_cmd = [uv, "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, "pip", "install", ".", *additional_dependencies))

pre_commit_uv-4.1.4/tests/test_main.py

@@ -0,0 +1,68 @@
+from __future__ import annotations
+
+from importlib.metadata import version
+from subprocess import check_call, check_output
+from textwrap import dedent
+from typing import TYPE_CHECKING
+
+import pytest
+from pre_commit import main
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+precommit_file = ".pre-commit-config.yaml"
+uv = version("uv")
+self = version("pre-commit-uv")
+
+
+@pytest.fixture
+def git_repo(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Path:
+    conf = """
+    repos:
+      - repo: https://github.com/tox-dev/pyproject-fmt
+        rev: "2.2.0"
+        hooks:
+          - id: pyproject-fmt
+    """
+    conf_file = tmp_path / precommit_file
+    conf_file.write_text(dedent(conf))
+    monkeypatch.setenv("PRE_COMMIT_HOME", str(tmp_path / "store"))
+    monkeypatch.chdir(tmp_path)
+    check_call(["git", "init"])
+    return tmp_path
+
+
+@pytest.fixture
+def install_hook(git_repo: Path) -> None:
+    check_call(["pre-commit", "install", "--install-hooks", "-c", str(git_repo / precommit_file)])
+    check_call(["pre-commit", "clean"])  # ensures that 'install_environment' gets called
+
+
+@pytest.mark.usefixtures("install_hook")
+def test_run_precommit_hook() -> None:
+    hook_result = check_output([".git/hooks/pre-commit"], encoding="utf-8")
+    assert f"[INFO] Using pre-commit with uv {uv} via pre-commit-uv {self}" in hook_result.splitlines()
+
+
+@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()
+
+
+def test_install(git_repo: Path, caplog: pytest.LogCaptureFixture, 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)])
+
+    assert caplog.messages == [
+        "Initializing environment for https://github.com/tox-dev/pyproject-fmt.",
+        "Installing environment for https://github.com/tox-dev/pyproject-fmt.",
+        "Once installed this environment will be reused.",
+        "This may take a few minutes...",
+        f"Using pre-commit with uv {uv} via pre-commit-uv {self}",
+    ]

{pre_commit_uv-4.1.2 → pre_commit_uv-4.1.4}/tox.ini

@@ -24,7 +24,6 @@ pass_env =
     PYTEST_*
 set_env =
     COVERAGE_FILE = {work_dir}/.coverage.{env_name}
-    FORCE_PRE_COMMIT_UV_PATCH = true
 commands =
     python -m pytest {tty:--color=yes} {posargs: \
       --cov {env_site_packages_dir}{/}pre_commit_uv --cov {tox_root}{/}tests \

pre_commit_uv-4.1.2/tests/test_main.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-from importlib.metadata import version
-from subprocess import check_call
-from textwrap import dedent
-from typing import TYPE_CHECKING
-
-from pre_commit import main
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-    import pytest
-
-
-def test_install(tmp_path: Path, caplog: pytest.LogCaptureFixture, monkeypatch: pytest.MonkeyPatch) -> None:
-    conf = """
-    repos:
-      - repo: https://github.com/tox-dev/pyproject-fmt
-        rev: "2.2.0"
-        hooks:
-          - id: pyproject-fmt
-    """
-    conf_file = tmp_path / ".pre-commit-config.yaml"
-    conf_file.write_text(dedent(conf))
-    monkeypatch.setenv("PRE_COMMIT_HOME", str(tmp_path / "store"))
-    monkeypatch.chdir(tmp_path)
-    check_call(["git", "init"])
-
-    main.main(["install-hooks", "-c", str(conf_file)])
-
-    uv = version("uv")
-    self = version("pre-commit-uv")
-    assert caplog.messages == [
-        "Initializing environment for https://github.com/tox-dev/pyproject-fmt.",
-        "Installing environment for https://github.com/tox-dev/pyproject-fmt.",
-        "Once installed this environment will be reused.",
-        "This may take a few minutes...",
-        f"Using pre-commit with uv {uv} via pre-commit-uv {self}",
-    ]