From 86b635508bb870c5dc46357afd791415ebc3e737 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 10 Nov 2023 08:38:23 +0100 Subject: [PATCH 1/2] Use ruff instead of black for formatting --- CHANGELOG.md | 1 + README.md | 1 - pyproject.toml | 10 ++-------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 33bbfde..dd90fbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 23.6 (in development) +- Use ruff instead of black for formatting (). - Remove support for Python 3.7 (EOL) (#388). ## 23.5 (2023-06-02) diff --git a/README.md b/README.md index bbeba34..d793784 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![image](https://github.com/zostera/django-marina/workflows/CI/badge.svg?branch=main)](https://github.com/zostera/django-marina/actions?workflow=CI) [![Coverage Status](https://coveralls.io/repos/github/zostera/django-marina/badge.svg?branch=main)](https://coveralls.io/github/zostera/django-marina?branch=main) [![Latest PyPI version](https://img.shields.io/pypi/v/django-marina.svg)](https://pypi.python.org/pypi/django-marina) -[![Any color you like](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black) Django extensions by Zostera. diff --git a/pyproject.toml b/pyproject.toml index 1a0d3a4..000716a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,8 +103,7 @@ clean = "rm -rf docs/_build" [tool.hatch.envs.lint] dependencies = [ - "black>=23.3.0", - "ruff>=0.0.270", + "ruff>0.1", ] detached = true @@ -113,19 +112,14 @@ all = [ "style", ] fmt = [ - "black {args:.}", "ruff --fix {args:.}", + "ruff format {args:.}", "style", ] style = [ "ruff {args:.}", - "black --check --diff {args:.}", ] -[tool.black] -line-length = 120 -target_version = ["py38", "py39", "py310", "py311"] - [tool.ruff] fix = false fixable = [ From cada0104cabd0125736d60b5e3b3020d26ab32de Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Fri, 10 Nov 2023 08:38:52 +0100 Subject: [PATCH 2/2] CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd90fbe..2620ecf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 23.6 (in development) -- Use ruff instead of black for formatting (). +- Use ruff instead of black for formatting (#392). - Remove support for Python 3.7 (EOL) (#388). ## 23.5 (2023-06-02)