copier-python 0.23.0__tar.gz → 0.24.0__tar.gz

{copier_python-0.23.0 → copier_python-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: copier-python
-Version: 0.23.0
+Version: 0.24.0
 Summary: Copier template for Python projects with modern tooling
 Project-URL: Homepage, https://smkent.github.io/copier-python
 Project-URL: Repository, https://github.com/smkent/copier-python

{copier_python-0.23.0 → copier_python-0.24.0}/copier_python/update.py

@@ -3,12 +3,15 @@ from __future__ import annotations
 import json
 import os
 import subprocess
+from contextlib import contextmanager
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 
 from .repo import RepoWorktree
 
 if TYPE_CHECKING:
+    from collections.abc import Generator
+
     from .repo import RepoTarget
 
 TEMPLATE_REPO_URL = "https://github.com/smkent/copier-python"
@@ -25,6 +28,18 @@ class UpdateAction:
         with RepoWorktree.clone(self.repo, branch=self.branch) as worktree:
             return self._run(worktree)
 
+    @contextmanager
+    def _success_or_shell(
+        self, repo: RepoWorktree, name: str
+    ) -> Generator[None]:
+        try:
+            yield
+        except subprocess.CalledProcessError:
+            print(  # noqa: T201
+                f"{name} failed. Fix errors and exit the shell to continue."
+            )
+            repo.shell()
+
     def _run(self, repo: RepoWorktree) -> str | None:
         """Run copier update in the repo worktree."""
         copier_status = json.loads(
@@ -38,7 +53,6 @@ class UpdateAction:
         if not copier_status.get("update_available", False):
             return None
         repo.run(["copier", "update", "--skip-answered", "--vcs-ref", end_ref])
-        repo.run(["mise", "install"])
 
         status = repo.git_status()
         if not status:
@@ -54,13 +68,10 @@ class UpdateAction:
             if repo.has_conflicts(status):
                 raise RuntimeError("Conflicts remain, aborting")
 
-        try:
+        with self._success_or_shell(repo, "`mise install`"):
+            repo.run(["mise", "install"])
+        with self._success_or_shell(repo, "Lint/test"):
             repo.run_task("lt")
-        except subprocess.CalledProcessError:
-            print(  # noqa: T201
-                "Lint/test failed. Fix errors and exit the shell to continue."
-            )
-            repo.shell()
 
         title = "Apply template updates"
         body = ""

copier_python-0.24.0/tests/template/__snapshots__/test_commit_check.ambr

@@ -0,0 +1,55 @@
+# serializer version: 1
+# name: test_commit_check_config[private-commit-check.toml-accepted-with-disclosure]
+  '''
+  [commit]
+  conventional_commits = false
+  subject_max_length = 72
+  subject_min_length = 1
+  # Reject LLM session URL trailers and promotional "Generated with" lines
+  message_pattern = '(?ims)(?!.*^(?:[\w-]+-session:\s|\W*generated (?:with|by) \S))'
+  ai_attribution = "disclose"
+  ai_disclosure_trailers = ["Assisted-by"]
+  # Assisted-by: values must not be email addresses or URLs
+  ai_disclosure_pattern = '^(?!.*(@|://)).*\S'
+  
+  '''
+# ---
+# name: test_commit_check_config[private-commit-check.toml-not-accepted]
+  '''
+  [commit]
+  conventional_commits = false
+  subject_max_length = 72
+  subject_min_length = 1
+  # Reject LLM session URL trailers and promotional "Generated with" lines
+  message_pattern = '(?ims)(?!.*^(?:[\w-]+-session:\s|\W*generated (?:with|by) \S))'
+  ai_attribution = "forbid"
+  
+  '''
+# ---
+# name: test_commit_check_config[public-.github/commit-check.toml-accepted-with-disclosure]
+  '''
+  [commit]
+  conventional_commits = false
+  subject_max_length = 72
+  subject_min_length = 1
+  # Reject LLM session URL trailers and promotional "Generated with" lines
+  message_pattern = '(?ims)(?!.*^(?:[\w-]+-session:\s|\W*generated (?:with|by) \S))'
+  ai_attribution = "disclose"
+  ai_disclosure_trailers = ["Assisted-by"]
+  # Assisted-by: values must not be email addresses or URLs
+  ai_disclosure_pattern = '^(?!.*(@|://)).*\S'
+  
+  '''
+# ---
+# name: test_commit_check_config[public-.github/commit-check.toml-not-accepted]
+  '''
+  [commit]
+  conventional_commits = false
+  subject_max_length = 72
+  subject_min_length = 1
+  # Reject LLM session URL trailers and promotional "Generated with" lines
+  message_pattern = '(?ims)(?!.*^(?:[\w-]+-session:\s|\W*generated (?:with|by) \S))'
+  ai_attribution = "forbid"
+  
+  '''
+# ---

{copier_python-0.23.0 → copier_python-0.24.0}/tests/template/__snapshots__/test_contributing.ambr

@@ -183,12 +183,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -221,12 +225,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   ## Development documentation
   
@@ -350,6 +358,10 @@
   work. However, code and text you submit must be authored by you, not generated
   by an LLM.
   
+  Commits with LLM attribution are rejected. This includes `Assisted-by:` or
+  `Co-authored-by:` trailers, LLM session URLs, and promotional lines such as
+  "Generated with [...]".
+  
   '''
 # ---
 # name: test_contributing_features[not-accepted-no_docs]
@@ -383,6 +395,10 @@
   work. However, code and text you submit must be authored by you, not generated
   by an LLM.
   
+  Commits with LLM attribution are rejected. This includes `Assisted-by:` or
+  `Co-authored-by:` trailers, LLM session URLs, and promotional lines such as
+  "Generated with [...]".
+  
   ## Development documentation
   
   ### Prerequisites
@@ -503,12 +519,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -543,12 +563,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -583,12 +607,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -623,12 +651,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -663,12 +695,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -703,12 +739,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -743,12 +783,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -783,12 +827,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -823,12 +871,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -863,12 +915,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -903,12 +959,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -943,12 +1003,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---
@@ -983,12 +1047,16 @@
   A contributor is always the author of their contributions.
   You must read, review, and understand everything you submit, including
   LLM-generated code or text, and be able to explain it on request.
+  Contributions must be submitted by a person, not autonomously by a bot or
+  LLM agent.
   
   If a commit contains code or text largely generated by an LLM, add an
   `Assisted-by: <tool>:<model>` trailer to its message. This can be done
   automatically with `git commit --trailer="Assisted-by: <tool>:<model>"`.
   
   Do not use `Co-authored-by:` for LLM attribution. LLMs are tools, not authors.
+  Do not include LLM session URLs, or promotional lines such as
+  "Generated with [...]."
   
   '''
 # ---

{copier_python-0.23.0 → copier_python-0.24.0}/tests/template/test_commit_check.py

@@ -4,13 +4,16 @@ from typing import TYPE_CHECKING
 
 import pytest
 
-from tests.utils import template
-
 if TYPE_CHECKING:
     from collections.abc import Callable
     from pathlib import Path
 
+    from syrupy.assertion import SnapshotAssertion
+
 
+@pytest.mark.parametrize(
+    "llm_contribution_policy", ["accepted-with-disclosure", "not-accepted"]
+)
 @pytest.mark.parametrize(
     ("project_visibility", "config_path"),
     [
@@ -20,10 +23,13 @@ if TYPE_CHECKING:
 )
 def test_commit_check_config(
     render_template: Callable[..., Path],
+    snapshot: SnapshotAssertion,
     project_visibility: str,
     config_path: str,
+    llm_contribution_policy: str,
 ) -> None:
-    rendered = render_template(project_visibility=project_visibility)
-    assert (rendered / config_path).read_text() == (
-        template.dir / "includes" / "commit-check.toml"
-    ).read_text()
+    rendered = render_template(
+        project_visibility=project_visibility,
+        llm_contribution_policy=llm_contribution_policy,
+    )
+    assert (rendered / config_path).read_text() == snapshot

{copier_python-0.23.0 → copier_python-0.24.0}/tests/test_update.py

@@ -18,6 +18,7 @@ import pytest
 import yaml
 
 from copier_python.__main__ import main, update
+from tests.utils import template
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Generator, Sequence
@@ -29,7 +30,7 @@ DEFAULT_BRANCH_NAME = "fhqwhgads"
 DEFAULT_END_REF = "v0.22.2"
 
 
-@pytest.fixture(params=["v0.16.0"])
+@pytest.fixture(params=["v0.16.2"])
 def start_ref(request: pytest.FixtureRequest) -> str:
     return request.param
 
@@ -86,7 +87,7 @@ def create_project(
         postcreate: Callable[[Path], None] | None = None,
         **kwargs: Any,
     ) -> Path:
-        project = render_template(vcs_ref=vcs_ref)
+        project = render_template(vcs_ref=vcs_ref, **kwargs)
         timestamp = _vcs_ref_timestamp(vcs_ref)
         for cmd in (
             ["git", "init", "-b", DEFAULT_BRANCH_NAME],
@@ -223,15 +224,19 @@ def test_main_help(monkeypatch: pytest.MonkeyPatch) -> None:
         main()
 
 
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 def test_main_update_with_project_current(
     worktree: Path,
     expect_run: ExpectRun,
     create_project: Callable[..., Path],
+    project_visibility: str,
     end_ref: str,
     *,
     dry_run: bool,
 ) -> None:
-    create_project(vcs_ref=end_ref)
+    create_project(vcs_ref=end_ref, project_visibility=project_visibility)
     expect_run.expect(
         ["git", "clone", "https://github.com/ness/pkfire", str(worktree)]
     )
@@ -316,7 +321,6 @@ def test_main_update_error(
         ["copier", "update", "--skip-answered", "--vcs-ref", end_ref],
         cwd=worktree,
     )
-    expect_run.expect(["mise", "install"], cwd=worktree)
     expect_run.expect(
         ["git", "status", "--porcelain"], cwd=worktree, capture_output=True
     )
@@ -324,6 +328,7 @@ def test_main_update_error(
     expect_run.expect(
         ["git", "status", "--porcelain"], cwd=worktree, capture_output=True
     )
+    expect_run.expect(["mise", "install"], cwd=worktree)
     expect_run.expect(["mise", "run", "lt"], cwd=worktree)
     expect_run.expect([str(mock_shell)], cwd=worktree)
     for cmd in [
@@ -364,16 +369,20 @@ def test_main_update_repo_arguments(
         update([arg], dry_run=True)
 
 
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 def test_main_update_with_project(
     worktree: Path,
     expect_run: ExpectRun,
     create_project: Callable[..., Path],
+    project_visibility: str,
     end_ref: str,
     start_ref: str,
     *,
     dry_run: bool,
 ) -> None:
-    create_project(vcs_ref=start_ref)
+    create_project(vcs_ref=start_ref, project_visibility=project_visibility)
     commit_message = os.linesep.join(
         (
             "Apply template updates",
@@ -407,10 +416,10 @@ def test_main_update_with_project(
         ["copier", "update", "--skip-answered", "--vcs-ref", end_ref],
         cwd=worktree,
     )
-    expect_run.expect(["mise", "install"], cwd=worktree)
     expect_run.expect(
         ["git", "status", "--porcelain"], cwd=worktree, capture_output=True
     )
+    expect_run.expect(["mise", "install"], cwd=worktree)
     for cmd in [
         [*["mise", "run", "lt"]],
         [*["git", "add", "-A"]],