template update

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
-  "commit": "5c0d10f0784887bb2ee7c53dcd5a4d80ac36e145",
+  "commit": "32e75e0e62d551244a2df1ea5db73fe6bad26d03",
   "checkout": null,
   "context": {
     "cookiecutter": {

.pre-commit-config.yaml

@@ -10,10 +10,6 @@ repos:
   - id: check-added-large-files
   - id: debug-statements
   - id: mixed-line-ending
-- repo: https://github.com/psf/black
-  rev: 23.10.1
-  hooks:
-  - id: black
 - repo: https://github.com/keewis/blackdoc
   rev: v0.3.9
   hooks:
@@ -24,6 +20,7 @@ repos:
   hooks:
   - id: ruff
     args: [--fix, --show-fixes]
+  - id: ruff-format
 - repo: https://github.com/executablebooks/mdformat
   rev: 0.7.17
   hooks:

pyproject.toml

@@ -49,8 +49,9 @@ ignore = [
   # pydocstyle: Missing Docstrings
   "D1"
 ]
-# Black line length is 88, but black does not format comments.
-line-length = 110
+# Same as Black.
+indent-width = 4
+line-length = 88
 select = [
   # pyflakes
   "F",
@@ -63,6 +64,9 @@ select = [
   "D"
 ]
 
+[tool.ruff.lint.pycodestyle]
+max-line-length = 110
+
 [tool.ruff.pydocstyle]
 convention = "numpy"
 

tests/test_01_settings.py

@@ -112,7 +112,8 @@ def test_set_poolclass(poolclass: Union[str, sa.pool.Pool]) -> None:
     ],
 )
 def test_set_expiration(
-    expiration: Union[datetime.datetime, str], raises: contextlib.nullcontext  # type: ignore[type-arg]
+    expiration: Union[datetime.datetime, str],
+    raises: contextlib.nullcontext,  # type: ignore[type-arg]
 ) -> None:
     with raises:
         config.set(expiration=expiration)

tests/test_60_clean.py

@@ -85,7 +85,9 @@ def test_delete_unknown_files(
     ],
 )
 def test_delete_unknown_dirs(
-    recursive: bool, raises: contextlib.nullcontext, final_size: int  # type: ignore[type-arg]
+    recursive: bool,
+    raises: contextlib.nullcontext,  # type: ignore[type-arg]
+    final_size: int,
 ) -> None:
     fs, dirname = utils.get_cache_files_fs_dirname()
     fs.mkdir(f"{dirname}/unknown")