Merge pull request #91 from smkent/manage-cookie

Update project template cruft

Author: smkent

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": ".",
-  "commit": "757202d63c5e720d55fbd434d89ab8f45cd0c6bb",
+  "commit": "c4899ec894c43ac32a763a480b6fb0f209503ede",
   "context": {
     "cookiecutter": {
       "project_name": "Cookiecutter template for new Python projects",

.pre-commit-config.yaml

@@ -34,6 +34,14 @@ repos:
       - flake8-pyproject
       - flake8-simplify
       - pep8-naming
+  - repo: https://github.com/pycqa/autoflake
+    rev: v2.0.1
+    hooks:
+    - id: autoflake
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+    - id: pyupgrade
   - repo: local
     hooks:
     - id: mypy

cookie_python/manage/main.py

@@ -4,7 +4,7 @@
 import sys
 from enum import Enum
 from pathlib import Path
-from typing import Callable, Optional
+from typing import Callable
 
 from loguru import logger
 
@@ -28,7 +28,7 @@ class Action(str, Enum):
     def __new__(
         cls,
         value: str,
-        func: Optional[Callable[[argparse.Namespace], None]] = None,
+        func: Callable[[argparse.Namespace], None] | None = None,
         description: str = "",
     ) -> Action:
         obj = str.__new__(cls, value)

cookie_python/manage/repo.py

@@ -9,7 +9,7 @@
 from functools import cached_property
 from pathlib import Path
 from types import TracebackType
-from typing import Any, Optional
+from typing import Any
 
 import loguru
 
@@ -30,9 +30,9 @@ def __enter__(self) -> RepoSandbox:
 
     def __exit__(
         self,
-        exc_type: Optional[type[BaseException]] = None,
-        exc_val: Optional[BaseException] = None,
-        exc_tb: Optional[TracebackType] = None,
+        exc_type: type[BaseException] | None = None,
+        exc_val: BaseException | None = None,
+        exc_tb: TracebackType | None = None,
     ) -> None:
         self._stack.close()
 
@@ -58,7 +58,7 @@ def create_release(self, tag: str) -> None:
         )
 
     @cached_property
-    def logger(self) -> "loguru.Logger":
+    def logger(self) -> loguru.Logger:
         return loguru.logger.bind(repo=self.repo.full_name)
 
     @cached_property

pyproject.toml

@@ -66,6 +66,7 @@ help = "Check all files"
 [tool.poe.tasks.pytest]
 cmd = "pytest"
 help = "Run unit tests with pytest"
+env = { PYTHON_KEYRING_BACKEND = "keyring.backends.null.Keyring" }
 
 [tool.poe.tasks.test]
 sequence = ["lint", "pytest"]

tests/test_template.py

@@ -68,11 +68,11 @@ def test_project_license(cookies: Any, project_license: str) -> None:
     if project_license in ("MIT", "BSD-3-Clause"):
         # Compare copyright line separately
         if project_license == "MIT":
-            expected_copyright = "Copyright (c) {0} Ness".format(
+            expected_copyright = "Copyright (c) {} Ness".format(
                 datetime.date.today().year
             )
         elif project_license == "BSD-3-Clause":
-            expected_copyright = "Copyright (c) {0}, Ness".format(
+            expected_copyright = "Copyright (c) {}, Ness".format(
                 datetime.date.today().year
             )
         assert license_data.splitlines()[0] == expected_copyright
@@ -171,11 +171,11 @@ def test_rendered_readme(
         ),
     )
 
-    with open(os.path.join(result.project_path, "README.md"), "r") as f:
+    with open(os.path.join(result.project_path, "README.md")) as f:
         readme = f.read()
     if opt_update_expected_outputs:
         with open(expected_content_file, "w") as f:
             f.write(readme)
 
-    with open(expected_content_file, "r") as f:
+    with open(expected_content_file) as f:
         assert readme == f.read()