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

actions/pre_commit/conformalize_repo/lib.py

@@ -14,13 +14,16 @@ 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 actions import __version__
 from actions.constants import (
     ACTIONS_URL,
     BUMPVERSION_TOML,
@@ -87,7 +90,7 @@ from actions.pre_commit.utilities import (
     yield_toml_doc,
     yield_yaml_dict,
 )
-from actions.utilities import log_func_call, logged_run
+from actions.utilities import logged_run
 
 if TYPE_CHECKING:
     from collections.abc import Iterator, MutableSet
@@ -99,9 +102,10 @@ 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,
@@ -110,15 +114,26 @@ def conformalize_repo(
     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__all_versions: bool = SETTINGS.ci__pull_request__pytest__all_versions,
-    ci__pull_request__pytest__sops_age_key: str
+    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,
@@ -153,56 +168,67 @@ def conformalize_repo(
     script: str | None = SETTINGS.script,
     uv__native_tls: bool = SETTINGS.uv__native_tls,
 ) -> None:
-    variables = [
-        f"{ci__ca_certificates=}",
-        f"{ci__gitea=}",
-        f"{ci__token=}",
-        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=}",
-        f"{ci__push__publish__username=}",
-        f"{ci__push__publish__password=}",
-        f"{ci__push__publish__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=}",
-    ]
-    LOGGER.info(log_func_call(conformalize_repo, *variables))
+    LOGGER.info(
+        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(
         modifications=modifications,
@@ -233,47 +259,63 @@ def conformalize_repo(
         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:
@@ -338,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))
 
 
 ##
@@ -387,10 +430,9 @@ 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,
@@ -399,12 +441,15 @@ def add_ci_pull_request_yaml(
     pytest__ubuntu: bool = SETTINGS.ci__pull_request__pytest__ubuntu,
     pytest__windows: bool = SETTINGS.ci__pull_request__pytest__windows,
     pytest__all_versions: bool = SETTINGS.ci__pull_request__pytest__all_versions,
-    pytest__sops_age_key: str | None = SETTINGS.ci__pull_request__pytest__sops_age_key,
+    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
@@ -426,9 +471,10 @@ def add_ci_pull_request_yaml(
             ensure_contains(
                 steps,
                 action_run_hooks_dict(
-                    token=token,
+                    token_checkout=token_checkout,
+                    token_github=token_github,
                     submodules=pre_commit__submodules,
-                    repos=["pre-commit/pre-commit-hooks"],
+                    repos=["dycw/actions", "pre-commit/pre-commit-hooks"],
                     gitea=gitea,
                 ),
             )
@@ -441,20 +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__all_versions
-            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"
@@ -468,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}}",
@@ -503,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
+                ),
+            )
 
 
 ##
@@ -511,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
@@ -531,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")
@@ -565,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,
+        ),
+    )
+
+
 ##
 
 
@@ -615,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(
@@ -636,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
         """)
     )

actions/pre_commit/conformalize_repo/settings.py

@@ -1,18 +1,23 @@
 from __future__ import annotations
 
 from typed_settings import Secret, load_settings, option, secret, settings
-from utilities.pytest import IS_CI
 
+from actions.pre_commit.conformalize_repo.constants import RUN_VERSION_BUMP
 from actions.utilities import LOADER
 
 
 @settings
 class Settings:
-    ci__ca_certificates: bool = option(
+    ci__certificates: bool = option(
         default=False, help="Update CA certficates before each step"
     )
     ci__gitea: bool = option(default=False, help="Set up CI on Gitea")
-    ci__token: str | None = option(default=None, help="Set up CI with this token")
+    ci__token_checkout: Secret[str] | None = secret(
+        default=None, help="Set up CI with this checkout token"
+    )
+    ci__token_github: Secret[str] | None = secret(
+        default=None, help="Set up CI with this GitHub token"
+    )
     ci__pull_request__pre_commit: bool = option(
         default=False, help="Set up CI 'pull-request.yaml' pre-commit"
     )
@@ -34,24 +39,45 @@ class Settings:
     ci__pull_request__pytest__all_versions: bool = option(
         default=False, help="Set up CI 'pull-request.yaml' pytest with all versions"
     )
-    ci__pull_request__pytest__sops_age_key: str | None = option(
+    ci__pull_request__pytest__sops_age_key: Secret[str] | None = secret(
         default=None,
         help="Set up CI 'pull-request.yaml' pytest with this 'age' key for 'sops'",
     )
     ci__pull_request__ruff: bool = option(
         default=False, help="Set up CI 'pull-request.yaml' ruff"
     )
-    ci__push__publish: bool = option(
-        default=False, help="Set up CI 'push.yaml' publishing"
+    ci__push__publish__github: bool = option(
+        default=False, help="Set up CI 'push.yaml' publishing to GitHub"
+    )
+    ci__push__publish__primary: bool = option(
+        default=False, help="Set up CI 'push.yaml' publishing #1"
+    )
+    ci__push__publish__primary__job_name: str = option(
+        default="pypi", help="Set up CI 'push.yaml' publishing #1 with this job name"
+    )
+    ci__push__publish__primary__username: str | None = option(
+        default=None, help="Set up CI 'push.yaml' publishing #1 with this username"
+    )
+    ci__push__publish__primary__password: Secret[str] | None = secret(
+        default=None, help="Set up CI 'push.yaml' publishing #1 with this password"
+    )
+    ci__push__publish__primary__publish_url: str | None = option(
+        default=None, help="Set up CI 'push.yaml' publishing #1 with this URL"
+    )
+    ci__push__publish__secondary: bool = option(
+        default=False, help="Set up CI 'push.yaml' publishing #2"
+    )
+    ci__push__publish__secondary__job_name: str = option(
+        default="pypi2", help="Set up CI 'push.yaml' publishing #2 with this job name"
     )
-    ci__push__publish__username: str | None = option(
-        default=None, help="Set up CI 'push.yaml' publishing with this username"
+    ci__push__publish__secondary__username: str | None = option(
+        default=None, help="Set up CI 'push.yaml' publishing #2 with this username"
     )
-    ci__push__publish__password: Secret[str] | None = secret(
-        default=None, help="Set up CI 'push.yaml' publishing with this password"
+    ci__push__publish__secondary__password: Secret[str] | None = secret(
+        default=None, help="Set up CI 'push.yaml' publishing #2 with this password"
     )
-    ci__push__publish__publish_url: Secret[str] | None = secret(
-        default=None, help="Set up CI 'push.yaml' publishing with this URL"
+    ci__push__publish__secondary__publish_url: str | None = option(
+        default=None, help="Set up CI 'push.yaml' publishing #2 with this URL"
     )
     ci__push__tag: bool = option(default=False, help="Set up CI 'push.yaml' tagging")
     ci__push__tag__all: bool = option(
@@ -108,7 +134,7 @@ class Settings:
     readme: bool = option(default=False, help="Set up 'README.md'")
     repo_name: str | None = option(default=None, help="Repo name")
     ruff: bool = option(default=False, help="Set up 'ruff.toml'")
-    run_version_bump: bool = option(default=not IS_CI, help="Run version bump")
+    run_version_bump: bool = option(default=RUN_VERSION_BUMP, help="Run version bump")
     uv__native_tls: bool = option(default=False, help="Setup 'uv' with native TLS")
     script: str | None = option(
         default=None, help="Set up a script instead of a package"

actions/pre_commit/format_requirements/lib.py

@@ -3,11 +3,13 @@ from __future__ import annotations
 import sys
 from typing import TYPE_CHECKING
 
+from utilities.functions import get_func_name
+from utilities.tabulate import func_param_desc
 from utilities.text import repr_str
 
+from actions import __version__
 from actions.logging import LOGGER
 from actions.pre_commit.utilities import get_pyproject_dependencies, yield_toml_doc
-from actions.utilities import log_func_call
 
 if TYPE_CHECKING:
     from collections.abc import MutableSet
@@ -18,7 +20,7 @@ if TYPE_CHECKING:
 
 
 def format_requirements(*paths: PathLike) -> None:
-    LOGGER.info(log_func_call(format_requirements, f"{paths=}"))
+    LOGGER.info(func_param_desc(format_requirements, __version__, f"{paths=}"))
     modifications: set[Path] = set()
     for path in paths:
         _format_path(path, modifications=modifications)
@@ -28,6 +30,7 @@ def format_requirements(*paths: PathLike) -> None:
             ", ".join(map(repr_str, sorted(modifications))),
         )
         sys.exit(1)
+    LOGGER.info("Finished running %r", get_func_name(format_requirements))
 
 
 def _format_path(