From 380a877a0beb82d941995f6f4e93ad6efcb51423 Mon Sep 17 00:00:00 2001 From: Dylan Verheul Date: Thu, 9 Nov 2023 16:13:57 +0100 Subject: [PATCH] Use ruff instead of black for formatting (#653) --- CHANGELOG.md | 4 ++++ README.md | 3 +-- pyproject.toml | 8 +------- src/bootstrap4/__about__.py | 2 +- tests/test_version.py | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94683bd4..b05d8bdf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## In development + +- Use ruff instead of black for formatting (). + ## 23.2 (2023-06-28) - Fix references to example application (#648). diff --git a/README.md b/README.md index 72716fd6..6beae806 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,8 @@ [![CI](https://github.com/zostera/django-bootstrap4/workflows/CI/badge.svg?branch=main)](https://github.com/zostera/django-bootstrap4/actions?workflow=CI) [![Coverage Status](https://coveralls.io/repos/github/zostera/django-bootstrap4/badge.svg?branch=main)](https://coveralls.io/github/zostera/django-bootstrap4?branch=main) [![Latest PyPI version](https://img.shields.io/pypi/v/django-bootstrap4.svg)](https://pypi.python.org/pypi/django-bootstrap4) -[![Any color you like](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black) -Bootstrap 4 integration for Django. +Bootstrap 4 for Django. ## Goal diff --git a/pyproject.toml b/pyproject.toml index 80c27def..4fcfd6d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -123,7 +123,6 @@ clean = "rm -rf docs/_build" [tool.hatch.envs.lint] dependencies = [ - "black>=23.3.0", "ruff>=0.0.270", ] detached = true @@ -133,19 +132,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 = [ diff --git a/src/bootstrap4/__about__.py b/src/bootstrap4/__about__.py index 029e0b22..961690fa 100644 --- a/src/bootstrap4/__about__.py +++ b/src/bootstrap4/__about__.py @@ -1 +1 @@ -__version__ = "23.2" +__version__ = "23.3.dev0" diff --git a/tests/test_version.py b/tests/test_version.py index 0a4179ad..e85eac25 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -9,4 +9,4 @@ def test_version(self): version = bootstrap4.__version__ version_parts = version.split(".") - self.assertEqual(len(version_parts), 2) + self.assertTrue(len(version_parts) >= 2)