Use frozen=True for most tests (#268)

nathanjmcdougall · web-flow · commit c5872123eb53 · 2025-02-07T14:59:42.000+13:00
* Use frozen=True for most tests

* Add missing early return
diff --git a/src/usethis/_core/tool.py b/src/usethis/_core/tool.py
@@ -103,9 +103,7 @@ def use_pre_commit(*, remove: bool = False) -> None:
 
     if not remove:
         add_deps_to_group(tool.dev_deps, "dev")
-        for _tool in ALL_TOOLS:
-            if _tool.is_used():
-                _tool.add_pre_commit_repo_configs()
+        _add_all_tools_pre_commit_configs()
 
         if pyproject_fmt_tool.is_used():
             # We will use pre-commit instead of the dev-dep.
@@ -135,6 +133,7 @@ def use_pre_commit(*, remove: bool = False) -> None:
         add_deps_to_group(tool.dev_deps, "dev")
 
         uninstall_pre_commit_hooks()
+
         remove_pre_commit_config()
         remove_deps_from_group(tool.dev_deps, "dev")
 
@@ -150,6 +149,12 @@ def use_pre_commit(*, remove: bool = False) -> None:
             _requirements_txt_instructions_basic()
 
 
+def _add_all_tools_pre_commit_configs():
+    for _tool in ALL_TOOLS:
+        if _tool.is_used():
+            _tool.add_pre_commit_repo_configs()
+
+
 def _add_bitbucket_linter_steps_to_default() -> None:
     # This order of adding tools should be synced with the order hard-coded
     # in the function which adds steps.
diff --git a/src/usethis/_integrations/pre_commit/core.py b/src/usethis/_integrations/pre_commit/core.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 
-from usethis._console import info_print, tick_print
+from usethis._config import usethis_config
+from usethis._console import box_print, info_print, tick_print
 from usethis._integrations.pre_commit.errors import PreCommitInstallationError
 from usethis._integrations.uv.call import call_uv_subprocess
 from usethis._integrations.uv.errors import UVSubprocessFailedError
@@ -22,6 +23,10 @@ def install_pre_commit_hooks() -> None:
     Note that this requires pre-commit to be installed. It also requires the user to be
     in a git repo.
     """
+    if usethis_config.frozen:
+        box_print("Run 'uv run pre-commit install' to register pre-commit with git.")
+        return
+
     tick_print("Ensuring pre-commit is installed to Git.")
     try:
         call_uv_subprocess(["run", "pre-commit", "install"])
@@ -45,6 +50,12 @@ def uninstall_pre_commit_hooks() -> None:
     Note that this requires pre-commit to be installed. It also requires the user to be
     in a git repo.
     """
+    if usethis_config.frozen:
+        box_print(
+            "Run 'uv run pre-commit uninstall' to deregister pre-commit with git."
+        )
+        return
+
     tick_print("Ensuring pre-commit hooks are uninstalled.")
     try:
         call_uv_subprocess(["run", "pre-commit", "uninstall"])
diff --git a/src/usethis/_integrations/uv/call.py b/src/usethis/_integrations/uv/call.py
@@ -12,7 +12,15 @@ def call_uv_subprocess(args: list[str]) -> str:
     """
     read_pyproject_toml_from_path.cache_clear()
     new_args = ["uv", *args]
-    if usethis_config.frozen:
+    if usethis_config.frozen and args[0] in {
+        "run",
+        "add",
+        "remove",
+        "sync",
+        "lock",
+        "export",
+        "tree",
+    }:
         new_args.append("--frozen")
     try:
         return call_subprocess(new_args)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,16 +1,18 @@
+import shutil
 from collections.abc import Generator
 from enum import Enum
 from pathlib import Path
 
 import pytest
 
 from usethis._config import usethis_config
-from usethis._integrations.uv.call import call_uv_subprocess
+from usethis._integrations.uv.call import call_subprocess, call_uv_subprocess
 from usethis._test import change_cwd, is_offline
 
 
-@pytest.fixture
-def uv_init_dir(tmp_path: Path) -> Path:
+@pytest.fixture(scope="session")
+def _uv_init_dir(tmp_path_factory: pytest.TempPathFactory) -> Path:
+    tmp_path = tmp_path_factory.mktemp("uv_init")
     with change_cwd(tmp_path):
         call_uv_subprocess(
             [
@@ -22,21 +24,39 @@ def uv_init_dir(tmp_path: Path) -> Path:
                 "none",
             ]
         )
+
     return tmp_path
 
 
 @pytest.fixture
-def uv_init_repo_dir(tmp_path: Path) -> Path:
+def uv_init_dir(tmp_path: Path, _uv_init_dir: Path) -> Generator[Path, None, None]:
     with change_cwd(tmp_path):
-        call_uv_subprocess(
-            [
-                "init",
-                "--lib",
-                "--python",
-                "3.12",
-            ]
+        shutil.copytree(
+            src=_uv_init_dir, dst=tmp_path, symlinks=True, dirs_exist_ok=True
         )
-    return tmp_path
+
+    with usethis_config.set(frozen=True):
+        yield tmp_path
+
+
+@pytest.fixture
+def uv_init_repo_dir(tmp_path: Path, _uv_init_dir: Path) -> Generator[Path, None, None]:
+    with change_cwd(tmp_path):
+        shutil.copytree(
+            src=_uv_init_dir, dst=tmp_path, symlinks=True, dirs_exist_ok=True
+        )
+
+        call_subprocess(["git", "init"])
+
+    with usethis_config.set(frozen=True):
+        yield tmp_path
+
+
+@pytest.fixture
+def uv_env_dir(uv_init_repo_dir: Path) -> Generator[Path, None, None]:
+    """A directory with a git repo, as well as uv-unfrozen project; allow venv and lockfile."""
+    with change_cwd(uv_init_repo_dir), usethis_config.set(frozen=False):
+        yield uv_init_repo_dir
 
 
 class NetworkConn(Enum):
diff --git a/tests/test_install.py b/tests/test_install.py
@@ -21,7 +21,9 @@ def usethis_installed_dir(
             usethis_dev_dir,
             copy_usethis_dev_dir,
             # The git repo is too big and we don't need it
-            ignore=shutil.ignore_patterns(".git"),
+            # Also ignore the virtual environment
+            ignore=shutil.ignore_patterns(".git", ".venv"),
+            symlinks=True,
         )
 
         with change_cwd(copy_usethis_dev_dir):
@@ -39,12 +41,12 @@ def usethis_installed_dir(
 
 
 class TestInstalledInOwnVenv:
-    def test_help(self, usethis_installed_dir):
+    def test_help(self, usethis_installed_dir: Path):
         with change_cwd(usethis_installed_dir):
             # Should run without error
             call_subprocess(["usethis", "--help"])
 
-    def test_add_pytest(self, usethis_installed_dir):
+    def test_add_pytest(self, usethis_installed_dir: Path):
         with change_cwd(usethis_installed_dir):
             # Should run without error
             call_subprocess(["usethis", "tool", "pytest"])
diff --git a/tests/usethis/_core/test_tool.py b/tests/usethis/_core/test_tool.py
@@ -225,24 +225,24 @@ def test_run_deptry_pass(self, uv_init_dir: Path):
 
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_pre_commit_after(
-            self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]
+            self, uv_env_dir: Path, capfd: pytest.CaptureFixture[str]
         ):
             # Act
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_env_dir):
                 use_deptry()
                 use_pre_commit()
 
                 # Assert
                 hook_names = get_hook_names()
 
             # 1. File exists
-            assert (uv_init_repo_dir / ".pre-commit-config.yaml").exists()
+            assert (uv_env_dir / ".pre-commit-config.yaml").exists()
 
             # 2. Hook is in the file
             assert "deptry" in hook_names
 
             # 3. Test file contents
-            assert (uv_init_repo_dir / ".pre-commit-config.yaml").read_text() == (
+            assert (uv_env_dir / ".pre-commit-config.yaml").read_text() == (
                 """\
 repos:
   - repo: local
@@ -459,9 +459,9 @@ def test_remove(
 class TestPreCommit:
     class TestAdd:
         @pytest.mark.usefixtures("_vary_network_conn")
-        def test_fresh(self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]):
+        def test_fresh(self, uv_env_dir: Path, capfd: pytest.CaptureFixture[str]):
             # Act
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_env_dir):
                 use_pre_commit()
 
                 # Assert
@@ -483,8 +483,8 @@ def test_fresh(self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]):
                 "☐ Run 'pre-commit run --all-files' to run the hooks manually.\n"
             )
             # Config file
-            assert (uv_init_repo_dir / ".pre-commit-config.yaml").exists()
-            contents = (uv_init_repo_dir / ".pre-commit-config.yaml").read_text()
+            assert (uv_env_dir / ".pre-commit-config.yaml").exists()
+            contents = (uv_env_dir / ".pre-commit-config.yaml").read_text()
             assert contents == (
                 """\
 repos:
@@ -531,28 +531,28 @@ def test_config_file_already_exists(self, uv_init_repo_dir: Path):
             )
 
         @pytest.mark.usefixtures("_vary_network_conn")
-        def test_bad_commit(self, uv_init_repo_dir: Path):
+        def test_bad_commit(self, uv_env_dir: Path):
             # Act
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_env_dir):
                 use_pre_commit()
-            subprocess.run(["git", "add", "."], cwd=uv_init_repo_dir, check=True)
+            subprocess.run(["git", "add", "."], cwd=uv_env_dir, check=True)
             subprocess.run(
-                ["git", "commit", "-m", "Good commit"], cwd=uv_init_repo_dir, check=True
+                ["git", "commit", "-m", "Good commit"], cwd=uv_env_dir, check=True
             )
 
             # Assert
-            (uv_init_repo_dir / "pyproject.toml").write_text("[")
-            subprocess.run(["git", "add", "."], cwd=uv_init_repo_dir, check=True)
+            (uv_env_dir / "pyproject.toml").write_text("[")
+            subprocess.run(["git", "add", "."], cwd=uv_env_dir, check=True)
             with pytest.raises(subprocess.CalledProcessError):
                 subprocess.run(
                     ["git", "commit", "-m", "Bad commit"],
-                    cwd=uv_init_repo_dir,
+                    cwd=uv_env_dir,
                     check=True,
                 )
 
         @pytest.mark.usefixtures("_vary_network_conn")
-        def test_requirements_txt_used(self, uv_init_repo_dir: Path):
-            with change_cwd(uv_init_repo_dir):
+        def test_requirements_txt_used(self, uv_env_dir: Path):
+            with change_cwd(uv_env_dir):
                 # Arrange
                 use_requirements_txt()
 
@@ -603,11 +603,9 @@ def test_dep(self, uv_init_repo_dir: Path):
                 assert not get_deps_from_group("dev")
 
         @pytest.mark.usefixtures("_vary_network_conn")
-        def test_stdout(
-            self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]
-        ):
+        def test_stdout(self, uv_env_dir: Path, capfd: pytest.CaptureFixture[str]):
             # Arrange
-            (uv_init_repo_dir / ".pre-commit-config.yaml").write_text(
+            (uv_env_dir / ".pre-commit-config.yaml").write_text(
                 """\
 repos:
   - repo: local
@@ -617,7 +615,7 @@ def test_stdout(
             )
 
             # Act
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_env_dir):
                 use_pre_commit(remove=True)
 
             # Assert
@@ -632,9 +630,9 @@ def test_stdout(
 
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_requirements_txt_used(
-            self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]
+            self, uv_env_dir: Path, capfd: pytest.CaptureFixture[str]
         ):
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_env_dir):
                 # Arrange
                 with usethis_config.set(quiet=True):
                     use_pre_commit()
@@ -654,9 +652,9 @@ def test_requirements_txt_used(
 
         @pytest.mark.usefixtures("_vary_network_conn")
         def test_pyproject_fmt_used(
-            self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]
+            self, uv_env_dir: Path, capfd: pytest.CaptureFixture[str]
         ):
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_env_dir):
                 # Arrange
                 with usethis_config.set(quiet=True):
                     use_pre_commit()
@@ -692,13 +690,12 @@ def test_prexisting(self, uv_init_repo_dir: Path):
             contents = (uv_init_repo_dir / "bitbucket-pipelines.yml").read_text()
             assert "pre-commit" in contents
 
-        def test_remove(
-            self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]
-        ):
+        def test_remove(self, uv_env_dir: Path, capfd: pytest.CaptureFixture[str]):
             # Arrange
-            with change_cwd(uv_init_repo_dir), usethis_config.set(quiet=True):
+            with change_cwd(uv_env_dir):
                 use_pre_commit()
-            (uv_init_repo_dir / "bitbucket-pipelines.yml").write_text(
+            capfd.readouterr()
+            (uv_env_dir / "bitbucket-pipelines.yml").write_text(
                 """\
 image: atlassian/default-image:3
 pipelines:
@@ -711,11 +708,11 @@ def test_remove(
             )
 
             # Act
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_env_dir):
                 use_pre_commit(remove=True)
 
             # Assert
-            contents = (uv_init_repo_dir / "bitbucket-pipelines.yml").read_text()
+            contents = (uv_env_dir / "bitbucket-pipelines.yml").read_text()
             assert (
                 contents
                 == """\
@@ -1409,7 +1406,7 @@ def test_start_from_uv_init(
             self, uv_init_dir: Path, capfd: pytest.CaptureFixture[str]
         ):
             # Act
-            with change_cwd(uv_init_dir):
+            with change_cwd(uv_init_dir), usethis_config.set(frozen=False):
                 use_requirements_txt()
 
             # Assert
@@ -1425,7 +1422,7 @@ def test_start_from_uv_init(
         def test_start_from_uv_locked(
             self, uv_init_dir: Path, capfd: pytest.CaptureFixture[str]
         ):
-            with change_cwd(uv_init_dir):
+            with change_cwd(uv_init_dir), usethis_config.set(frozen=False):
                 # Arrange
                 call_uv_subprocess(["lock"])
 
@@ -1444,10 +1441,10 @@ def test_start_from_uv_locked(
         def test_pre_commit(
             self, uv_init_repo_dir: Path, capfd: pytest.CaptureFixture[str]
         ):
-            with change_cwd(uv_init_repo_dir):
+            with change_cwd(uv_init_repo_dir), usethis_config.set(frozen=False):
                 # Arrange
-                with usethis_config.set(quiet=True):
-                    use_pre_commit()
+                use_pre_commit()
+                capfd.readouterr()
 
                 # Act
                 use_requirements_txt()
diff --git a/tests/usethis/_integrations/pre_commit/test_core.py b/tests/usethis/_integrations/pre_commit/test_core.py
