copier-python 0.21.0__tar.gz → 0.22.1__tar.gz

{copier_python-0.21.0 → copier_python-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: copier-python
-Version: 0.21.0
+Version: 0.22.1
 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.21.0 → copier_python-0.22.1}/copier_python/__main__.py

@@ -73,6 +73,9 @@ class UpdateResult:
 def update(
     repos: Args.Repos,
     *,
+    vcs_ref: Annotated[
+        str | None, Option("--vcs-ref", "-r", help="Template ref to update to")
+    ] = None,
     dry_run: Args.DryRun = False,
     branch: Annotated[str, Option(help="Branch name to create.")] = "updates",
 ) -> None:
@@ -82,7 +85,9 @@ def update(
     repo_targets = {(target := RepoTarget(repo)).url: target for repo in repos}
     for target in repo_targets.values():
         try:
-            pr_url = UpdateAction(target, branch=branch, dry_run=dry_run)()
+            pr_url = UpdateAction(
+                target, branch=branch, vcs_ref=vcs_ref, dry_run=dry_run
+            )()
             if pr_url:
                 results.append(
                     UpdateResult(target, UpdateStatus.UPDATED, pr_url=pr_url)

{copier_python-0.21.0 → copier_python-0.22.1}/copier_python/repo.py

@@ -146,7 +146,7 @@ class RepoWorktree:
         ).get("_commit")
 
     def shell(self) -> None:
-        self.run([os.environ.get("SHELL", "/bin/bash")], check=False)
+        self.run([os.environ.get("SHELL", "/bin/bash")])
 
     def open_pr(self, title: str, body: str) -> str:
         result = self.run(

{copier_python-0.21.0 → copier_python-0.22.1}/copier_python/update.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 import os
 import subprocess
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 
 from .repo import RepoWorktree
@@ -18,7 +18,8 @@ TEMPLATE_REPO_URL = "https://github.com/smkent/copier-python"
 class UpdateAction:
     repo: RepoTarget
     branch: str
-    dry_run: bool = False
+    vcs_ref: str | None = None
+    dry_run: bool = field(default=False, kw_only=True)
 
     def __call__(self) -> str | None:
         with RepoWorktree.clone(self.repo, branch=self.branch) as worktree:
@@ -33,10 +34,10 @@ class UpdateAction:
             ).stdout.strip()
         )
         start_ref = "v" + copier_status["current_version"]
-        end_ref = "v" + copier_status["latest_version"]
+        end_ref = self.vcs_ref or ("v" + copier_status["latest_version"])
         if not copier_status.get("update_available", False):
             return None
-        repo.run(["copier", "update", "--skip-answered"])
+        repo.run(["copier", "update", "--skip-answered", "--vcs-ref", end_ref])
         repo.run(["mise", "install"])
 
         status = repo.git_status()

{copier_python-0.21.0 → copier_python-0.22.1}/tests/test_update.py

@@ -312,17 +312,20 @@ def test_main_update_error(
         cwd=worktree,
         capture_output=True,
     )
-    expect_run.expect(["copier", "update", "--skip-answered"], cwd=worktree)
+    expect_run.expect(
+        ["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([str(mock_shell)], cwd=worktree, check=False)
+    expect_run.expect([str(mock_shell)], cwd=worktree)
     expect_run.expect(
         ["git", "status", "--porcelain"], cwd=worktree, capture_output=True
     )
     expect_run.expect(["mise", "run", "lt"], cwd=worktree)
-    expect_run.expect([str(mock_shell)], cwd=worktree, check=False)
+    expect_run.expect([str(mock_shell)], cwd=worktree)
     for cmd in [
         [*["git", "add", "-A"]],
         [*["git", "commit", "-m", commit_message]],
@@ -400,7 +403,10 @@ def test_main_update_with_project(
         cwd=worktree,
         capture_output=True,
     )
-    expect_run.expect(["copier", "update", "--skip-answered"], cwd=worktree)
+    expect_run.expect(
+        ["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