pre-commit-uv 4.1.3__tar.gz → 4.1.5__tar.gz

{pre_commit_uv-4.1.3 → pre_commit_uv-4.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: pre-commit-uv
-Version: 4.1.3
+Version: 4.1.5
 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.3 → pre_commit_uv-4.1.5}/src/pre_commit_uv/__init__.py

@@ -59,22 +59,40 @@ def _new_main(argv: list[str] | None = None) -> int:
     ) -> 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()
-        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,
+            "--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, "pip", "install", ".", *additional_dependencies))
+            setup_cmd(
+                prefix,
+                (
+                    uv,
+                    "--project",
+                    project_root_dir,
+                    "pip",
+                    "install",
+                    ".",
+                    *additional_dependencies,
+                ),
+            )
 
     @cache
     def _uv() -> str:
@@ -100,11 +118,11 @@ def _new_main(argv: list[str] | None = None) -> int:
 
         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())
+            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))
+    return cast("int", _original_main(argv))

{pre_commit_uv-4.1.3 → pre_commit_uv-4.1.5}/tests/test_main.py

@@ -66,3 +66,97 @@ def test_install(git_repo: Path, caplog: pytest.LogCaptureFixture, monkeypatch:
         "This may take a few minutes...",
         f"Using pre-commit with uv {uv} via pre-commit-uv {self}",
     ]
+
+
+test_install_with_uv_config_cases: list[tuple[str, str]] = [
+    (
+        "pyproject.toml",
+        """
+[[tool.uv.index]]
+name = "internal"
+url = "https://pypi.org/simple/"
+default = true
+""",
+    ),
+    (
+        "uv.toml",
+        """
+[[index]]
+name = "internal"
+url = "https://pypi.org/simple/"
+default = true
+""",
+    ),
+]
+
+
+@pytest.mark.parametrize(
+    ("file_name", "content"),
+    test_install_with_uv_config_cases,
+)
+def test_install_with_uv_config(
+    git_repo: Path,
+    caplog: pytest.LogCaptureFixture,
+    monkeypatch: pytest.MonkeyPatch,
+    file_name: str,
+    content: str,
+) -> None:
+    (git_repo / file_name).write_text(dedent(content))
+
+    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}",
+    ]
+
+
+test_install_with_uv_config_raises_error_cases: list[tuple[str, str]] = [
+    (
+        "pyproject.toml",
+        """
+[[tool.uv.index]]
+name = "internal"
+url = "https://pypi.example/simple/"
+default = true
+""",
+    ),
+    (
+        "uv.toml",
+        """
+[[index]]
+name = "internal"
+url = "https://pypi.example/simple/"
+default = true
+""",
+    ),
+]
+
+
+@pytest.mark.parametrize(("file_name", "content"), test_install_with_uv_config_raises_error_cases)
+def test_install_with_uv_config_raises_error(
+    git_repo: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    file_name: str,
+    content: str,
+) -> None:
+    """Test to make sure that uv config is used for non default pypi repos."""
+    (git_repo / file_name).write_text(dedent(content))
+
+    monkeypatch.setenv("FORCE_PRE_COMMIT_UV_PATCH", "1")
+
+    import pre_commit_uv  # noqa: PLC0415
+
+    pre_commit_uv._patch()  # noqa: SLF001
+
+    # would raise SystemExit due to bad config
+    with pytest.raises(SystemExit):
+        main.main(["install-hooks", "-c", str(git_repo / precommit_file)])