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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: copier-python
-Version: 0.22.2
+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.22.2 → 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.22.2 → copier_python-0.23.1}/tests/template/test_agents.py

@@ -1,13 +1,17 @@
-"""Snapshot tests for AGENTS.md template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 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", template.choices.llm_contribution_policy

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_compose.py

@@ -1,13 +1,21 @@
-"""Snapshot tests for compose.yaml template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
+from tests.utils import template
 
-@pytest.mark.parametrize("project_visibility", ["public", "private"])
+if TYPE_CHECKING:
+    from collections.abc import Callable
+    from pathlib import Path
+
+    from syrupy.assertion import SnapshotAssertion
+
+
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 def test_compose_features(
     render_template: Callable[..., Path],
     snapshot: SnapshotAssertion,

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_contributing.py

@@ -1,13 +1,17 @@
-"""Snapshot tests for CONTRIBUTING.md template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 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(
     "enable_docs",

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_dockerfile.py

@@ -1,13 +1,17 @@
-"""Snapshot tests for Dockerfile templates."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 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(
     "python_version_minimum", template.python_versions.min_param

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_docs.py

@@ -1,13 +1,17 @@
-"""Snapshot tests for zensical.toml template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 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(
     "enable_pypi",
@@ -37,7 +41,9 @@ def test_docs_features(
         assert (rendered / "docs" / doc_file).read_text() == snapshot
 
 
-@pytest.mark.parametrize("project_visibility", ["public", "private"])
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 @pytest.mark.parametrize(
     "enable_pypi",
     [pytest.param(True, id="pypi"), pytest.param(False, id="no_pypi")],

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_license.py

@@ -1,14 +1,18 @@
-"""Snapshot tests for LICENSE template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
 import yaml
-from syrupy.assertion import SnapshotAssertion
 
 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(
     "copyright_license", template.choices.copyright_license
@@ -24,7 +28,7 @@ def test_license(
             assert (rendered / name).read_text() == snapshot
 
 
-@pytest.mark.parametrize("project_type", ["application", "library"])
+@pytest.mark.parametrize("project_type", template.choices.project_type)
 def test_license_default(
     render_template: Callable[..., Path], project_type: str
 ) -> None:

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_mise_toml.py

@@ -1,13 +1,21 @@
-"""Snapshot tests for mise.toml template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
+from tests.utils import template
 
-@pytest.mark.parametrize("project_visibility", ["public", "private"])
+if TYPE_CHECKING:
+    from collections.abc import Callable
+    from pathlib import Path
+
+    from syrupy.assertion import SnapshotAssertion
+
+
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 @pytest.mark.parametrize(
     "enable_docs",
     [pytest.param(True, id="docs"), pytest.param(False, id="no_docs")],

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_pyproject.py

@@ -1,15 +1,21 @@
-"""Snapshot tests for pyproject.toml template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 from tests.utils import template
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+    from pathlib import Path
 
-@pytest.mark.parametrize("project_visibility", ["public", "private"])
+    from syrupy.assertion import SnapshotAssertion
+
+
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 @pytest.mark.parametrize(
     "python_version_minimum", template.python_versions.min_param_full_range
 )

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_readme.py

@@ -1,13 +1,17 @@
-"""Snapshot tests for README.md template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 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(
     "enable_coverage",
@@ -40,7 +44,9 @@ def test_readme_features(
     assert (rendered / "README.md").read_text() == snapshot
 
 
-@pytest.mark.parametrize("project_visibility", ["public", "private"])
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 @pytest.mark.parametrize(
     "copyright_license", template.choices.copyright_license
 )
@@ -57,7 +63,7 @@ def test_readme_project_visibility(
     assert (rendered / "README.md").read_text() == snapshot
 
 
-@pytest.mark.parametrize("project_type", ["application", "library"])
+@pytest.mark.parametrize("project_type", template.choices.project_type)
 def test_readme_project_type(
     render_template: Callable[..., Path],
     snapshot: SnapshotAssertion,

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_workflows.py

@@ -1,13 +1,17 @@
-"""Snapshot tests for GitHub workflow templates."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
 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(
     "enable_coverage",

{copier_python-0.22.2 → copier_python-0.23.1}/tests/template/test_zensical.py

@@ -1,13 +1,21 @@
-"""Snapshot tests for zensical.toml template."""
+from __future__ import annotations
 
-from collections.abc import Callable
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
+from tests.utils import template
 
-@pytest.mark.parametrize("project_visibility", ["public", "private"])
+if TYPE_CHECKING:
+    from collections.abc import Callable
+    from pathlib import Path
+
+    from syrupy.assertion import SnapshotAssertion
+
+
+@pytest.mark.parametrize(
+    "project_visibility", template.choices.project_visibility
+)
 @pytest.mark.parametrize(
     "enable_pypi",
     [pytest.param(True, id="pypi"), pytest.param(False, id="no_pypi")],

{copier_python-0.22.2 → copier_python-0.23.1}/tests/test_update.py

@@ -26,7 +26,7 @@ if TYPE_CHECKING:
 
 
 DEFAULT_BRANCH_NAME = "fhqwhgads"
-DEFAULT_END_REF = "v0.20.0"
+DEFAULT_END_REF = "v0.22.2"
 
 
 @pytest.fixture(params=["v0.16.0"])
@@ -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"]],