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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: copier-python
-Version: 0.23.0
+Version: 0.23.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.23.0 → copier_python-0.23.1}/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.23.0 → copier_python-0.23.1}/tests/test_update.py

@@ -316,7 +316,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 +323,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 [
@@ -407,10 +407,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"]],