refactor: Format code with Ruff

pawamoy · Jan 18, 2024 · 2c0c9f1 · 2c0c9f1
1 parent 432673b
commit 2c0c9f1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 <!-- insertion marker -->
+## [1.2.1](https://github.com/pawamoy/copier-pdm/releases/tag/1.2.1) - 2024-01-12
+
+<small>[Compare with 1.2.0](https://github.com/pawamoy/copier-pdm/compare/1.2.0...1.2.1)</small>
+
+### Code Refactoring
+
+- Format code with Ruff ([609c48f](https://github.com/pawamoy/copier-pdm/commit/609c48f3950b2720b9c840f5b7e061ccaac8b524) by Timothée Mazzucotelli).
+
 ## [1.2.0](https://github.com/pawamoy/copier-pdm/releases/tag/1.2.0) - 2024-01-08
 
 <small>[Compare with 1.1.3](https://github.com/pawamoy/copier-pdm/compare/1.1.3...1.2.0)</small>

diff --git a/Makefile b/Makefile
@@ -14,6 +14,9 @@ docs:
 docs-deploy:
 	@mkdocs gh-deploy
 
+format:
+	@ruff format
+
 gen generate:
 	@bash -c 'source tests/helpers.sh && generate ${PWD} tests/tmp'
 

diff --git a/project/config/ruff.toml.jinja b/project/config/ruff.toml.jinja
@@ -1,5 +1,5 @@
 target-version = "py38"
-line-length = 132
+line-length = 120
 exclude = [
     "fixtures",
     "site",
@@ -102,3 +102,7 @@ known-first-party = ["{{ python_package_import_name }}"]
 
 [pydocstyle]
 convention = "google"
+
+[format]
+docstring-code-format = true
+docstring-code-line-length = 80
diff --git a/project/duties.py.jinja b/project/duties.py.jinja
@@ -10,7 +10,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Iterator
 
 from duty import duty
-from duty.callables import black, coverage, lazy, mkdocs, mypy, pytest, ruff, safety
+from duty.callables import coverage, lazy, mkdocs, mypy, pytest, ruff, safety
 
 if TYPE_CHECKING:
     from duty.context import Context
@@ -227,7 +227,7 @@ def format(ctx: Context) -> None:
         ruff.check(*PY_SRC_LIST, config="config/ruff.toml", fix_only=True, exit_zero=True),
         title="Auto-fixing code",
     )
-    ctx.run(black.run(*PY_SRC_LIST, config="config/black.toml"), title="Formatting code")
+    ctx.run(ruff.format(*PY_SRC_LIST, config="config/ruff.toml"), title="Formatting code")
     {#- ctx.run(
         blacken_docs.run(*PY_SRC_LIST, "docs", exts=["py", "md"], line_length=120),
         title="Formatting docs",

diff --git a/ruff.toml b/ruff.toml
@@ -0,0 +1,6 @@
+target-version = "py38"
+line-length = 120
+
+[format]
+docstring-code-format = true
+docstring-code-line-length = 80