chore: fix Ruff linter errors

Author: sisp

copier/_jinja_ext.py

@@ -5,7 +5,7 @@
 from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from pathlib import PurePath
-from typing import Any
+from typing import Any, ClassVar
 from weakref import WeakKeyDictionary
 
 from jinja2 import Environment, nodes
@@ -94,7 +94,7 @@ class YieldExtension(Extension):
         ```
     """
 
-    tags = {"yield"}
+    tags: ClassVar[set[str]] = {"yield"}
 
     def preprocess(
         self, source: str, name: str | None, filename: str | None = None

copier/_main.py

@@ -83,6 +83,11 @@
     YieldTagInFileError,
 )
 
+if sys.version_info < (3, 11):
+    from typing_extensions import Self
+else:
+    from typing import Self
+
 _T = TypeVar("_T")
 _P = ParamSpec("_P")
 
@@ -262,7 +267,7 @@ class Worker:
     answers: AnswersMap = field(default_factory=AnswersMap, init=False)
     _cleanup_hooks: list[Callable[[], None]] = field(default_factory=list, init=False)
 
-    def __enter__(self) -> Worker:
+    def __enter__(self) -> Self:
         """Allow using worker as a context manager."""
         return self
 
@@ -427,7 +432,9 @@ def _execute_tasks(self, tasks: Sequence[Task]) -> None:
 
             extra_env = {k[1:].upper(): str(v) for k, v in extra_context.items()}
             with local.cwd(working_directory), local.env(**extra_env):
-                process = subprocess.run(task_cmd, shell=use_shell, env=dict(local.env))
+                process = subprocess.run(
+                    task_cmd, shell=use_shell, check=False, env=dict(local.env)
+                )
                 if process.returncode:
                     raise TaskError.from_process(process)
 
@@ -613,7 +620,7 @@ def _ask(self) -> None:  # noqa: C901
                 try:
                     answer = question.parse_answer(self.answers.last[var_name])
                     question.validate_answer(answer)
-                except Exception:
+                except Exception:  # noqa: BLE001
                     del self.answers.last[var_name]
             # Skip a question when the skip condition is met.
             if not question.get_when():
@@ -1062,7 +1069,7 @@ def _render_parts(  # noqa: C901
         context pairs.
         """
         if rendered_parts is None:
-            rendered_parts = tuple()
+            rendered_parts = ()
 
         if not parts:
             rendered_path = Path(*rendered_parts)

copier/_template.py

@@ -94,7 +94,7 @@ class _Loader(yaml.SafeLoader):
 
     def _include(loader: yaml.Loader, node: yaml.Node) -> Any:
         if not isinstance(node, yaml.ScalarNode):
-            raise ValueError(f"Unsupported YAML node: {node!r}")
+            raise TypeError(f"Unsupported YAML node: {node!r}")
         include_file = str(loader.construct_scalar(node))
         if PurePosixPath(include_file).is_absolute():
             raise ValueError("YAML include file path must be a relative path")

copier/_tools.py

@@ -15,7 +15,7 @@
 from importlib.metadata import version
 from pathlib import Path
 from types import TracebackType
-from typing import Any, Literal, TextIO, TypeVar, cast
+from typing import Any, ClassVar, Literal, TextIO, TypeVar, cast
 
 import colorama
 from packaging.version import Version
@@ -28,11 +28,11 @@
 class Style:
     """Common color styles."""
 
-    OK = [colorama.Fore.GREEN, colorama.Style.BRIGHT]
-    WARNING = [colorama.Fore.YELLOW, colorama.Style.BRIGHT]
-    IGNORE = [colorama.Fore.CYAN]
-    DANGER = [colorama.Fore.RED, colorama.Style.BRIGHT]
-    RESET = [colorama.Fore.RESET, colorama.Style.RESET_ALL]
+    OK: ClassVar[list[str]] = [colorama.Fore.GREEN, colorama.Style.BRIGHT]
+    WARNING: ClassVar[list[str]] = [colorama.Fore.YELLOW, colorama.Style.BRIGHT]
+    IGNORE: ClassVar[list[str]] = [colorama.Fore.CYAN]
+    DANGER: ClassVar[list[str]] = [colorama.Fore.RED, colorama.Style.BRIGHT]
+    RESET: ClassVar[list[str]] = [colorama.Fore.RESET, colorama.Style.RESET_ALL]
 
 
 INDENT = " " * 2
@@ -175,7 +175,7 @@ def handle_remove_readonly(
         Path(path).chmod(stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)  # 0777
         func(path)
     else:
-        raise
+        raise exc
 
 
 _re_whitespace = re.compile(r"^\s+|\s+$")

copier/_user_data.py

@@ -8,7 +8,7 @@
 from collections.abc import Callable, Mapping, Sequence
 from copy import deepcopy
 from dataclasses import field
-from datetime import datetime
+from datetime import datetime, timezone
 from functools import cached_property
 from hashlib import sha512
 from os import urandom
@@ -47,7 +47,7 @@ def _now() -> datetime:
         "strftime format reference https://strftime.org/",
         FutureWarning,
     )
-    return datetime.utcnow()
+    return datetime.now(tz=timezone.utc())
 
 
 def _make_secret() -> str:
@@ -368,9 +368,8 @@ def _formatted_choices(self) -> Sequence[Choice]:
 
     def get_message(self) -> str:
         """Get the message that will be printed to the user."""
-        if self.help:
-            if rendered_help := self.render_value(self.help):
-                return force_str_end(rendered_help) + "  "
+        if self.help and (rendered_help := self.render_value(self.help)):
+            return force_str_end(rendered_help) + "  "
         # Otherwise, there's no help message defined.
         message = self.var_name
         if (answer_type := self.get_type_name()) != "str":
@@ -387,11 +386,11 @@ def get_questionary_structure(self) -> AnyByStrDict:  # noqa: C901
         def _validate(answer: str) -> str | Literal[True]:
             try:
                 ans = self.parse_answer(answer)
-            except Exception:
+            except Exception:  # noqa: BLE001
                 return "Invalid input"
             try:
                 self.validate_answer(ans)
-            except Exception as exc:
+            except Exception as exc:  # noqa: BLE001
                 return str(exc)
             return True
 
@@ -460,7 +459,7 @@ def validate_answer(self, answer: Any) -> None:
         """Validate user answer."""
         try:
             err_msg = self.render_value(self.validator, {self.var_name: answer}).strip()
-        except Exception as error:
+        except Exception as error:  # noqa: BLE001
             err_msg = str(error)
         if err_msg:
             raise ValueError(
@@ -557,12 +556,12 @@ def parse_yaml_list(string: str) -> list[str]:
         The parsed list of raw items.
 
     Raises:
-        ValueError: If the YAML string is not a list.
+        TypeError: If the YAML string is not a list.
     """
     node = yaml.compose(string, Loader=yaml.SafeLoader)
 
     if not isinstance(node, yaml.nodes.SequenceNode):
-        raise ValueError(f"Not a YAML list: {string!r}")
+        raise TypeError(f"Not a YAML list: {string!r}")
 
     items = []
     for item in node.value:
@@ -571,12 +570,13 @@ def parse_yaml_list(string: str) -> list[str]:
         if (
             isinstance(item, yaml.nodes.ScalarNode)
             and item.tag == "tag:yaml.org,2002:str"
-        ):
             # Strip quotes if the value is quoted to avoid double-quoting.
-            if (raw.startswith('"') and raw.endswith('"')) or (
-                raw.startswith("'") and raw.endswith("'")
-            ):
-                raw = raw[1:-1]
+            and (
+                (raw.startswith('"') and raw.endswith('"'))
+                or (raw.startswith("'") and raw.endswith("'"))
+            )
+        ):
+            raw = raw[1:-1]
 
         items.append(raw)
 

copier/_vcs.py

@@ -116,10 +116,12 @@ def is_git_bundle(path: Path) -> bool:
     """Indicate if a path is a valid git bundle."""
     with suppress(OSError):
         path = path.resolve()
-    with TemporaryDirectory(prefix=f"{__name__}.is_git_bundle.") as dirname:
-        with local.cwd(dirname):
-            get_git()("init")
-            return bool(get_git()["bundle", "verify", path] & TF)
+    with (
+        TemporaryDirectory(prefix=f"{__name__}.is_git_bundle.") as dirname,
+        local.cwd(dirname),
+    ):
+        get_git()("init")
+        return bool(get_git()["bundle", "verify", path] & TF)
 
 
 def get_repo(url: str) -> str | None:
@@ -145,7 +147,7 @@ def get_repo(url: str) -> str | None:
         if url.startswith("git+"):
             return url[4:]
         if url.startswith("https://") and not url.endswith(GIT_POSTFIX):
-            return "".join((url, GIT_POSTFIX))
+            return f"{url}{GIT_POSTFIX}"
         return url
 
     url_path = Path(url)

tests/test_copy.py

@@ -511,7 +511,7 @@ def test_value_with_forward_slash(tmp_path_factory: pytest.TempPathFactory) -> N
         ({"type": "str"}, 1.1, does_not_raise()),
         ({"type": "str"}, True, does_not_raise()),
         ({"type": "str"}, False, does_not_raise()),
-        ({"type": "str"}, Decimal(1.1), does_not_raise()),
+        ({"type": "str"}, Decimal("1.1"), does_not_raise()),
         ({"type": "str"}, Enum("A", ["a", "b"], type=str).a, does_not_raise()),  # type: ignore[attr-defined]
         ({"type": "str"}, Enum("A", ["a", "b"]).a, pytest.raises(ValueError)),  # type: ignore[attr-defined]
         ({"type": "str"}, object(), pytest.raises(ValueError)),

tests/test_interrupts.py

@@ -34,9 +34,11 @@ def test_keyboard_interrupt(
     )
     worker = Worker(str(src), dst, defaults=False)
 
-    with patch("copier._main.unsafe_prompt", side_effect=side_effect):
-        with pytest.raises(KeyboardInterrupt):
-            worker.run_copy()
+    with (
+        patch("copier._main.unsafe_prompt", side_effect=side_effect),
+        pytest.raises(KeyboardInterrupt),
+    ):
+        worker.run_copy()
 
 
 def test_multiple_questions_interrupt(tmp_path_factory: pytest.TempPathFactory) -> None:

tests/test_migrations.py

@@ -567,7 +567,7 @@ def test_migration_jinja_variables(
 
     assert (dst / "vars.txt").is_file()
     raw_vars = (dst / "vars.txt").read_text().split("\n")
-    vars = map(lambda x: x.strip(), raw_vars)
+    vars = {v.strip() for v in raw_vars}
     for variable, value in variables.items():
         assert f"{variable}={value}" in vars
 

tests/test_prompt.py

@@ -1169,6 +1169,7 @@ def test_interactive_session_required_for_question_prompt(
         stdin=subprocess.PIPE,  # Prevents interactive input
         capture_output=True,
         timeout=spawn_timeout or None,
+        check=False,
     )
     assert process.returncode == 1
     assert (
@@ -1197,6 +1198,7 @@ def test_interactive_session_required_for_overwrite_prompt(
         stdin=subprocess.PIPE,  # Prevents interactive input
         capture_output=True,
         timeout=spawn_timeout or None,
+        check=False,
     )
     assert process.returncode == 1
     assert (