dycw-actions 0.8.5__py3-none-any.whl → 0.11.3__py3-none-any.whl

actions/pre_commit/conformalize_repo/lib.py

@@ -14,13 +14,14 @@ from typing import TYPE_CHECKING, Literal, assert_never
 import tomlkit
 from tomlkit import TOMLDocument, table
 from tomlkit.exceptions import NonExistentKey
+from utilities.functions import get_func_name
 from utilities.inflect import counted_noun
 from utilities.re import extract_groups
 from utilities.subprocess import ripgrep
+from utilities.tabulate import func_param_desc
 from utilities.text import repr_str, strip_and_dedent
 from utilities.throttle import throttle
 from utilities.version import ParseVersionError, Version, parse_version
-from utilities.whenever import HOUR
 
 from actions import __version__
 from actions.constants import (
@@ -34,7 +35,6 @@ from actions.constants import (
     GITHUB_PUSH_YAML,
     GITIGNORE,
     MAX_PYTHON_VERSION,
-    PATH_THROTTLE_CACHE,
     PRE_COMMIT_CONFIG_YAML,
     PYPROJECT_TOML,
     PYRIGHTCONFIG_JSON,
@@ -65,6 +65,7 @@ from actions.pre_commit.conformalize_repo.constants import (
     UV_URL,
 )
 from actions.pre_commit.conformalize_repo.settings import SETTINGS
+from actions.pre_commit.constants import THROTTLE_DELTA
 from actions.pre_commit.format_requirements.constants import FORMAT_REQUIREMENTS_SUB_CMD
 from actions.pre_commit.replace_sequence_strs.constants import (
     REPLACE_SEQUENCE_STRS_SUB_CMD,
@@ -83,6 +84,7 @@ from actions.pre_commit.utilities import (
     get_dict,
     get_list,
     get_table,
+    path_throttle_cache,
     yield_json_dict,
     yield_text_file,
     yield_toml_doc,
@@ -100,23 +102,38 @@ if TYPE_CHECKING:
 
 def conformalize_repo(
     *,
-    ci__ca_certificates: bool = SETTINGS.ci__ca_certificates,
+    ci__certificates: bool = SETTINGS.ci__certificates,
     ci__gitea: bool = SETTINGS.ci__gitea,
-    ci__token: str | None = SETTINGS.ci__token,
+    ci__token_checkout: Secret[str] | None = SETTINGS.ci__token_checkout,
+    ci__token_github: Secret[str] | None = SETTINGS.ci__token_github,
     ci__pull_request__pre_commit: bool = SETTINGS.ci__pull_request__pre_commit,
+    ci__pull_request__pre_commit__submodules: str
+    | None = SETTINGS.ci__pull_request__pre_commit__submodules,
     ci__pull_request__pyright: bool = SETTINGS.ci__pull_request__pyright,
     ci__pull_request__pytest__macos: bool = SETTINGS.ci__pull_request__pytest__macos,
     ci__pull_request__pytest__ubuntu: bool = SETTINGS.ci__pull_request__pytest__ubuntu,
     ci__pull_request__pytest__windows: bool = SETTINGS.ci__pull_request__pytest__windows,
-    ci__pull_request__pytest__sops_age_key: str
+    ci__pull_request__pytest__all_versions: bool = SETTINGS.ci__pull_request__pytest__all_versions,
+    ci__pull_request__pytest__sops_age_key: Secret[str]
     | None = SETTINGS.ci__pull_request__pytest__sops_age_key,
     ci__pull_request__ruff: bool = SETTINGS.ci__pull_request__ruff,
-    ci__push__publish: bool = SETTINGS.ci__push__publish,
-    ci__push__publish__username: str | None = SETTINGS.ci__push__publish__username,
-    ci__push__publish__password: Secret[str]
-    | None = SETTINGS.ci__push__publish__password,
-    ci__push__publish__publish_url: Secret[str]
-    | None = SETTINGS.ci__push__publish__publish_url,
+    ci__push__publish__github: bool = SETTINGS.ci__push__publish__github,
+    ci__push__publish__primary: bool = SETTINGS.ci__push__publish__primary,
+    ci__push__publish__primary__job_name: str = SETTINGS.ci__push__publish__primary__job_name,
+    ci__push__publish__primary__username: str
+    | None = SETTINGS.ci__push__publish__primary__username,
+    ci__push__publish__primary__password: Secret[str]
+    | None = SETTINGS.ci__push__publish__primary__password,
+    ci__push__publish__primary__publish_url: str
+    | None = SETTINGS.ci__push__publish__primary__publish_url,
+    ci__push__publish__secondary: bool = SETTINGS.ci__push__publish__secondary,
+    ci__push__publish__secondary__job_name: str = SETTINGS.ci__push__publish__secondary__job_name,
+    ci__push__publish__secondary__username: str
+    | None = SETTINGS.ci__push__publish__secondary__username,
+    ci__push__publish__secondary__password: Secret[str]
+    | None = SETTINGS.ci__push__publish__secondary__password,
+    ci__push__publish__secondary__publish_url: str
+    | None = SETTINGS.ci__push__publish__secondary__publish_url,
     ci__push__tag: bool = SETTINGS.ci__push__tag,
     ci__push__tag__all: bool = SETTINGS.ci__push__tag__all,
     coverage: bool = SETTINGS.coverage,
@@ -152,101 +169,65 @@ def conformalize_repo(
     uv__native_tls: bool = SETTINGS.uv__native_tls,
 ) -> None:
     LOGGER.info(
-        strip_and_dedent("""
-            Running '%s' (version %s) with settings:
-             - ci__ca_certificates                                = %s
-             - ci__gitea                                          = %s
-             - ci__token                                          = %s
-             - ci__pull_request__pre_commit                       = %s
-             - ci__pull_request__pyright                          = %s
-             - ci__pull_request__pytest__macos                    = %s
-             - ci__pull_request__pytest__ubuntu                   = %s
-             - ci__pull_request__pytest__windows                  = %s
-             - ci__pull_request__pytest__sops_age_key             = %s
-             - ci__pull_request__ruff                             = %s
-             - ci__push__publish                                  = %s
-             - ci__push__publish__username                        = %s
-             - ci__push__publish__password                        = %s
-             - ci__push__publish__publish_url                     = %s
-             - ci__push__tag                                      = %s
-             - ci__push__tag__all                                 = %s
-             - coverage                                           = %s
-             - description                                        = %s
-             - envrc                                              = %s
-             - envrc__uv                                          = %s
-             - gitignore                                          = %s
-             - package_name                                       = %s
-             - pre_commit__dockerfmt                              = %s
-             - pre_commit__prettier                               = %s
-             - pre_commit__python                                 = %s
-             - pre_commit__ruff                                   = %s
-             - pre_commit__shell                                  = %s
-             - pre_commit__taplo                                  = %s
-             - pre_commit__uv                                     = %s
-             - pyproject                                          = %s
-             - pyproject__project__optional_dependencies__scripts = %s
-             - pyproject__tool__uv__indexes                       = %s
-             - pyright                                            = %s
-             - pytest                                             = %s
-             - pytest__asyncio                                    = %s
-             - pytest__ignore_warnings                            = %s
-             - pytest__timeout                                    = %s
-             - python_package_name                                = %s
-             - python_version                                     = %s
-             - readme                                             = %s
-             - repo_name                                          = %s
-             - ruff                                               = %s
-             - run_version_bump                                   = %s
-             - script                                             = %s
-             - uv__native__tls                                    = %s
-        """),
-        conformalize_repo.__name__,
-        __version__,
-        ci__ca_certificates,
-        ci__gitea,
-        ci__token,
-        ci__pull_request__pre_commit,
-        ci__pull_request__pyright,
-        ci__pull_request__pytest__macos,
-        ci__pull_request__pytest__ubuntu,
-        ci__pull_request__pytest__windows,
-        ci__pull_request__pytest__sops_age_key,
-        ci__pull_request__ruff,
-        ci__push__publish,
-        ci__push__publish__username,
-        ci__push__publish__password,
-        ci__push__publish__publish_url,
-        ci__push__tag,
-        ci__push__tag__all,
-        coverage,
-        description,
-        envrc,
-        envrc__uv,
-        gitignore,
-        package_name,
-        pre_commit__dockerfmt,
-        pre_commit__prettier,
-        pre_commit__python,
-        pre_commit__ruff,
-        pre_commit__shell,
-        pre_commit__taplo,
-        pre_commit__uv,
-        pyproject,
-        pyproject__project__optional_dependencies__scripts,
-        pyproject__tool__uv__indexes,
-        pyright,
-        pytest,
-        pytest__asyncio,
-        pytest__ignore_warnings,
-        pytest__timeout,
-        python_package_name,
-        python_version,
-        readme,
-        repo_name,
-        ruff,
-        run_version_bump,
-        script,
-        uv__native_tls,
+        func_param_desc(
+            conformalize_repo,
+            __version__,
+            f"{ci__certificates=}",
+            f"{ci__gitea=}",
+            f"{ci__token_checkout=}",
+            f"{ci__token_github=}",
+            f"{ci__pull_request__pre_commit=}",
+            f"{ci__pull_request__pre_commit__submodules=}",
+            f"{ci__pull_request__pyright=}",
+            f"{ci__pull_request__pytest__macos=}",
+            f"{ci__pull_request__pytest__ubuntu=}",
+            f"{ci__pull_request__pytest__windows=}",
+            f"{ci__pull_request__pytest__all_versions=}",
+            f"{ci__pull_request__pytest__sops_age_key=}",
+            f"{ci__pull_request__ruff=}",
+            f"{ci__push__publish__github=}",
+            f"{ci__push__publish__primary=}",
+            f"{ci__push__publish__primary__job_name=}",
+            f"{ci__push__publish__primary__username=}",
+            f"{ci__push__publish__primary__password=}",
+            f"{ci__push__publish__primary__publish_url=}",
+            f"{ci__push__publish__secondary=}",
+            f"{ci__push__publish__secondary__job_name=}",
+            f"{ci__push__publish__secondary__username=}",
+            f"{ci__push__publish__secondary__password=}",
+            f"{ci__push__publish__secondary__publish_url=}",
+            f"{ci__push__tag=}",
+            f"{ci__push__tag__all=}",
+            f"{coverage=}",
+            f"{description=}",
+            f"{envrc=}",
+            f"{envrc__uv=}",
+            f"{gitignore=}",
+            f"{package_name=}",
+            f"{pre_commit__dockerfmt=}",
+            f"{pre_commit__prettier=}",
+            f"{pre_commit__python=}",
+            f"{pre_commit__ruff=}",
+            f"{pre_commit__shell=}",
+            f"{pre_commit__taplo=}",
+            f"{pre_commit__uv=}",
+            f"{pyproject=}",
+            f"{pyproject__project__optional_dependencies__scripts=}",
+            f"{pyproject__tool__uv__indexes=}",
+            f"{pyright=}",
+            f"{pytest=}",
+            f"{pytest__asyncio=}",
+            f"{pytest__ignore_warnings=}",
+            f"{pytest__timeout=}",
+            f"{python_package_name=}",
+            f"{python_version=}",
+            f"{readme=}",
+            f"{repo_name=}",
+            f"{ruff=}",
+            f"{run_version_bump=}",
+            f"{script=}",
+            f"{uv__native_tls=}",
+        )
     )
     modifications: set[Path] = set()
     add_bumpversion_toml(
@@ -273,50 +254,68 @@ def conformalize_repo(
     )
     if (
         ci__pull_request__pre_commit
+        or ci__pull_request__pre_commit__submodules
         or ci__pull_request__pyright
         or ci__pull_request__pytest__macos
         or ci__pull_request__pytest__ubuntu
         or ci__pull_request__pytest__windows
+        or ci__pull_request__pytest__all_versions
         or (ci__pull_request__pytest__sops_age_key is not None)
         or ci__pull_request__ruff
     ):
         add_ci_pull_request_yaml(
-            certificates=ci__ca_certificates,
             gitea=ci__gitea,
-            token=ci__token,
             modifications=modifications,
+            certificates=ci__certificates,
             pre_commit=ci__pull_request__pre_commit,
+            pre_commit__submodules=ci__pull_request__pre_commit__submodules,
             pyright=ci__pull_request__pyright,
             pytest__macos=ci__pull_request__pytest__macos,
             pytest__ubuntu=ci__pull_request__pytest__ubuntu,
             pytest__windows=ci__pull_request__pytest__windows,
+            pytest__all_versions=ci__pull_request__pytest__all_versions,
             pytest__sops_age_key=ci__pull_request__pytest__sops_age_key,
             pytest__timeout=pytest__timeout,
             python_version=python_version,
             repo_name=repo_name,
             ruff=ruff,
             script=script,
+            token_checkout=ci__token_checkout,
+            token_github=ci__token_github,
             uv__native_tls=uv__native_tls,
         )
     if (
-        ci__push__publish
-        or (ci__push__publish__username is not None)
-        or (ci__push__publish__password is not None)
-        or (ci__push__publish__publish_url is not None)
+        ci__push__publish__github
+        or ci__push__publish__primary
+        or (ci__push__publish__primary__username is not None)
+        or (ci__push__publish__primary__password is not None)
+        or (ci__push__publish__primary__publish_url is not None)
+        or ci__push__publish__secondary
+        or (ci__push__publish__secondary__username is not None)
+        or (ci__push__publish__secondary__password is not None)
+        or (ci__push__publish__secondary__publish_url is not None)
         or ci__push__tag
         or ci__push__tag__all
     ):
         add_ci_push_yaml(
-            certificates=ci__ca_certificates,
             gitea=ci__gitea,
-            token=ci__token,
             modifications=modifications,
-            publish=ci__push__publish,
-            publish__username=ci__push__publish__username,
-            publish__password=ci__push__publish__password,
-            publish__publish_url=ci__push__publish__publish_url,
+            certificates=ci__certificates,
+            publish__github=ci__push__publish__github,
+            publish__primary=ci__push__publish__primary,
+            publish__primary__job_name=ci__push__publish__primary__job_name,
+            publish__primary__username=ci__push__publish__primary__username,
+            publish__primary__password=ci__push__publish__primary__password,
+            publish__primary__publish_url=ci__push__publish__primary__publish_url,
+            publish__secondary=ci__push__publish__secondary,
+            publish__secondary__job_name=ci__push__publish__secondary__job_name,
+            publish__secondary__username=ci__push__publish__secondary__username,
+            publish__secondary__password=ci__push__publish__secondary__password,
+            publish__secondary__publish_url=ci__push__publish__secondary__publish_url,
             tag=ci__push__tag,
             tag__all=ci__push__tag__all,
+            token_checkout=ci__token_checkout,
+            token_github=ci__token_github,
             uv__native_tls=uv__native_tls,
         )
     if coverage:
@@ -381,6 +380,7 @@ def conformalize_repo(
             ", ".join(map(repr_str, sorted(modifications))),
         )
         sys.exit(1)
+    LOGGER.info("Finished running %r", get_func_name(conformalize_repo))
 
 
 ##
@@ -430,21 +430,26 @@ def _add_bumpversion_toml_file(path: PathLike, template: str, /) -> Table:
 
 def add_ci_pull_request_yaml(
     *,
-    certificates: bool = SETTINGS.ci__ca_certificates,
     gitea: bool = SETTINGS.ci__gitea,
-    token: str | None = SETTINGS.ci__token,
     modifications: MutableSet[Path] | None = None,
+    certificates: bool = SETTINGS.ci__certificates,
     pre_commit: bool = SETTINGS.ci__pull_request__pre_commit,
+    pre_commit__submodules: str
+    | None = SETTINGS.ci__pull_request__pre_commit__submodules,
     pyright: bool = SETTINGS.ci__pull_request__pyright,
     pytest__macos: bool = SETTINGS.ci__pull_request__pytest__macos,
     pytest__ubuntu: bool = SETTINGS.ci__pull_request__pytest__ubuntu,
     pytest__windows: bool = SETTINGS.ci__pull_request__pytest__windows,
-    pytest__sops_age_key: str | None = SETTINGS.ci__pull_request__pytest__sops_age_key,
+    pytest__all_versions: bool = SETTINGS.ci__pull_request__pytest__all_versions,
+    pytest__sops_age_key: Secret[str]
+    | None = SETTINGS.ci__pull_request__pytest__sops_age_key,
     pytest__timeout: int | None = SETTINGS.pytest__timeout,
     python_version: str = SETTINGS.python_version,
     repo_name: str | None = SETTINGS.repo_name,
     ruff: bool = SETTINGS.ci__pull_request__ruff,
     script: str | None = SETTINGS.script,
+    token_checkout: Secret[str] | None = SETTINGS.ci__token_checkout,
+    token_github: Secret[str] | None = SETTINGS.ci__token_github,
     uv__native_tls: bool = SETTINGS.uv__native_tls,
 ) -> None:
     path = GITEA_PULL_REQUEST_YAML if gitea else GITHUB_PULL_REQUEST_YAML
@@ -466,7 +471,11 @@ def add_ci_pull_request_yaml(
             ensure_contains(
                 steps,
                 action_run_hooks_dict(
-                    token=token, repos=["pre-commit/pre-commit-hooks"], gitea=gitea
+                    token_checkout=token_checkout,
+                    token_github=token_github,
+                    submodules=pre_commit__submodules,
+                    repos=["dycw/actions", "pre-commit/pre-commit-hooks"],
+                    gitea=gitea,
                 ),
             )
         if pyright:
@@ -478,19 +487,14 @@ def add_ci_pull_request_yaml(
             ensure_contains(
                 steps,
                 action_pyright_dict(
-                    token=token,
+                    token_checkout=token_checkout,
+                    token_github=token_github,
                     python_version=python_version,
                     with_requirements=script,
                     native_tls=uv__native_tls,
                 ),
             )
-        if (
-            pytest__macos
-            or pytest__ubuntu
-            or pytest__windows
-            or (pytest__sops_age_key is not None)
-            or pytest__timeout
-        ):
+        if pytest__macos or pytest__ubuntu or pytest__windows:
             pytest_dict = get_dict(jobs, "pytest")
             env = get_dict(pytest_dict, "env")
             env["CI"] = "1"
@@ -504,7 +508,8 @@ def add_ci_pull_request_yaml(
             ensure_contains(
                 steps,
                 action_pytest_dict(
-                    token=token,
+                    token_checkout=token_checkout,
+                    token_github=token_github,
                     python_version="${{matrix.python-version}}",
                     sops_age_key=pytest__sops_age_key,
                     resolution="${{matrix.resolution}}",
@@ -523,7 +528,12 @@ def add_ci_pull_request_yaml(
             if pytest__windows:
                 ensure_contains(os, "windows-latest")
             python_version_dict = get_list(matrix, "python-version")
-            ensure_contains(python_version_dict, *yield_python_versions(python_version))
+            if pytest__all_versions:
+                ensure_contains(
+                    python_version_dict, *yield_python_versions(python_version)
+                )
+            else:
+                ensure_contains(python_version_dict, python_version)
             resolution = get_list(matrix, "resolution")
             ensure_contains(resolution, "highest", "lowest-direct")
             if pytest__timeout is not None:
@@ -534,7 +544,12 @@ def add_ci_pull_request_yaml(
             steps = get_list(ruff_dict, "steps")
             if certificates:
                 ensure_contains(steps, update_ca_certificates_dict("steps"))
-            ensure_contains(steps, action_ruff_dict(token=token))
+            ensure_contains(
+                steps,
+                action_ruff_dict(
+                    token_checkout=token_checkout, token_github=token_github
+                ),
+            )
 
 
 ##
@@ -542,16 +557,30 @@ def add_ci_pull_request_yaml(
 
 def add_ci_push_yaml(
     *,
-    certificates: bool = SETTINGS.ci__ca_certificates,
     gitea: bool = SETTINGS.ci__gitea,
-    token: str | None = SETTINGS.ci__token,
     modifications: MutableSet[Path] | None = None,
-    publish: bool = SETTINGS.ci__push__publish,
-    publish__username: str | None = SETTINGS.ci__push__publish__username,
-    publish__password: Secret[str] | None = SETTINGS.ci__push__publish__password,
-    publish__publish_url: Secret[str] | None = SETTINGS.ci__push__publish__publish_url,
+    certificates: bool = SETTINGS.ci__certificates,
+    publish__github: bool = SETTINGS.ci__push__publish__github,
+    publish__primary: bool = SETTINGS.ci__push__publish__primary,
+    publish__primary__job_name: str = SETTINGS.ci__push__publish__primary__job_name,
+    publish__primary__username: str
+    | None = SETTINGS.ci__push__publish__primary__username,
+    publish__primary__password: Secret[str]
+    | None = SETTINGS.ci__push__publish__primary__password,
+    publish__primary__publish_url: str
+    | None = SETTINGS.ci__push__publish__primary__publish_url,
+    publish__secondary: bool = SETTINGS.ci__push__publish__secondary,
+    publish__secondary__job_name: str = SETTINGS.ci__push__publish__secondary__job_name,
+    publish__secondary__username: str
+    | None = SETTINGS.ci__push__publish__secondary__username,
+    publish__secondary__password: Secret[str]
+    | None = SETTINGS.ci__push__publish__secondary__password,
+    publish__secondary__publish_url: str
+    | None = SETTINGS.ci__push__publish__secondary__publish_url,
     tag: bool = SETTINGS.ci__push__tag,
     tag__all: bool = SETTINGS.ci__push__tag__all,
+    token_checkout: Secret[str] | None = SETTINGS.ci__token_checkout,
+    token_github: Secret[str] | None = SETTINGS.ci__token_github,
     uv__native_tls: bool = SETTINGS.uv__native_tls,
 ) -> None:
     path = GITEA_PUSH_YAML if gitea else GITHUB_PUSH_YAML
@@ -562,25 +591,37 @@ def add_ci_push_yaml(
         branches = get_list(push, "branches")
         ensure_contains(branches, "master")
         jobs = get_dict(dict_, "jobs")
-        if publish:
-            publish_dict = get_dict(jobs, "publish")
-            environment = get_dict(publish_dict, "environment")
-            environment["name"] = "pypi"
-            permissions = get_dict(publish_dict, "permissions")
-            permissions["id-token"] = "write"
-            publish_dict["runs-on"] = "ubuntu-latest"
-            steps = get_list(publish_dict, "steps")
-            if certificates:
-                ensure_contains(steps, update_ca_certificates_dict("publish"))
-            ensure_contains(
-                steps,
-                action_publish_package_dict(
-                    token=token,
-                    username=publish__username,
-                    password=publish__password,
-                    publish_url=publish__publish_url,
-                    native_tls=uv__native_tls,
-                ),
+        if publish__github:
+            _add_ci_push_yaml_publish_dict(
+                jobs,
+                "github",
+                github=True,
+                token_checkout=token_checkout,
+                token_github=token_github,
+            )
+        if publish__primary:
+            _add_ci_push_yaml_publish_dict(
+                jobs,
+                publish__primary__job_name,
+                certificates=certificates,
+                token_checkout=token_checkout,
+                token_github=token_github,
+                username=publish__primary__username,
+                password=publish__primary__password,
+                publish_url=publish__primary__publish_url,
+                uv__native_tls=uv__native_tls,
+            )
+        if publish__secondary:
+            _add_ci_push_yaml_publish_dict(
+                jobs,
+                publish__secondary__job_name,
+                certificates=certificates,
+                token_checkout=token_checkout,
+                token_github=token_github,
+                username=publish__secondary__username,
+                password=publish__secondary__password,
+                publish_url=publish__secondary__publish_url,
+                uv__native_tls=uv__native_tls,
             )
         if tag:
             tag_dict = get_dict(jobs, "tag")
@@ -596,6 +637,44 @@ def add_ci_push_yaml(
             )
 
 
+def _add_ci_push_yaml_publish_dict(
+    jobs: StrDict,
+    name: str,
+    /,
+    *,
+    github: bool = False,
+    certificates: bool = SETTINGS.ci__certificates,
+    token_checkout: Secret[str] | None = SETTINGS.ci__token_checkout,
+    token_github: Secret[str] | None = SETTINGS.ci__token_github,
+    username: str | None = None,
+    password: Secret[str] | None = None,
+    publish_url: str | None = None,
+    uv__native_tls: bool = SETTINGS.uv__native_tls,
+) -> None:
+    publish_name = f"publish-{name}"
+    publish_dict = get_dict(jobs, publish_name)
+    if github:
+        environment = get_dict(publish_dict, "environment")
+        environment["name"] = "pypi"
+        permissions = get_dict(publish_dict, "permissions")
+        permissions["id-token"] = "write"
+    publish_dict["runs-on"] = "ubuntu-latest"
+    steps = get_list(publish_dict, "steps")
+    if certificates:
+        ensure_contains(steps, update_ca_certificates_dict(publish_name))
+    ensure_contains(
+        steps,
+        action_publish_package_dict(
+            token_checkout=token_checkout,
+            token_github=token_github,
+            username=username,
+            password=password,
+            publish_url=publish_url,
+            native_tls=uv__native_tls,
+        ),
+    )
+
+
 ##
 
 
@@ -646,7 +725,7 @@ def add_envrc(
                 native_tls=uv__native_tls, python_version=python_version, script=script
             )
             if search(escape(uv_text), context.output, flags=MULTILINE) is None:
-                context.output += f"\n\n{echo}"
+                context.output += f"\n\n{uv_text}"
 
 
 def _add_envrc_uv_text(
@@ -667,14 +746,15 @@ def _add_envrc_uv_text(
         strip_and_dedent(f"""
             export UV_PRERELEASE='disallow'
             export UV_PYTHON='{python_version}'
+            export UV_VENV_CLEAR=1
             if ! command -v uv >/dev/null 2>&1; then
-                echo_date "ERROR: 'uv' not found" && exit 1
+            \techo_date "ERROR: 'uv' not found" && exit 1
             fi
             activate='.venv/bin/activate'
             if [ -f $activate ]; then
-                . $activate
+            \t. $activate
             else
-                uv venv
+            \tuv venv
             fi
         """)
     )
@@ -1210,7 +1290,7 @@ def _run_pre_commit_update(*, modifications: MutableSet[Path] | None = None) ->
 
 
 run_pre_commit_update = throttle(
-    delta=12 * HOUR, path=PATH_THROTTLE_CACHE / _run_pre_commit_update.__name__
+    delta=THROTTLE_DELTA, path=path_throttle_cache(_run_pre_commit_update)
 )(_run_pre_commit_update)