lint: switch Black with ruff-format

Author: Borda

.github/workflows/lint.yml

@@ -16,5 +16,3 @@ jobs:
     - uses: pre-commit/action@v3.0.1
       with:
         extra_args: --all-files --hook-stage manual
-      env:
-        SKIP: black-format

.pre-commit-config.yaml

@@ -1,24 +1,10 @@
 repos:
-- repo: https://github.com/psf/black-pre-commit-mirror
-  rev: 23.9.1
-  hooks:
-  - id: black
-    alias: black-check
-    name: black (check)
-    args: [--check, --diff]
-    exclude: ^git/ext/
-    stages: [manual]
-
-  - id: black
-    alias: black-format
-    name: black (format)
-    exclude: ^git/ext/
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   rev: v0.3.0
   hooks:
-  #- id: ruff-format  # todo: eventually replace Black with Ruff for consistency
-  #  args: ["--preview"]
+  - id: ruff-format
+    exclude: ^git/ext/
   - id: ruff
     args: ["--fix"]
     exclude: ^doc|^git/ext/

Makefile

@@ -4,7 +4,7 @@ all:
 	@awk -F: '/^[[:alpha:]].*:/ && !/^all:/ {print $$1}' Makefile
 
 lint:
-	SKIP=black-format pre-commit run --all-files --hook-stage manual
+	SKIP=pre-commit run --all-files --hook-stage manual
 
 clean:
 	rm -rf build/ dist/ .eggs/ .tox/

pyproject.toml

@@ -42,11 +42,6 @@ source = ["git"]
 include = ["*/git/*"]
 omit = ["*/git/ext/*"]
 
-[tool.black]
-line-length = 120
-target-version = ["py37"]
-extend-exclude = "git/ext/gitdb"
-
 [tool.ruff]
 target-version = "py37"
 line-length = 120

test-requirements.txt

@@ -1,4 +1,3 @@
-black
 coverage[toml]
 ddt >= 1.1.1, != 1.4.3
 mock ; python_version < "3.8"

tox.ini

@@ -12,8 +12,6 @@ commands = pytest --color=yes {posargs}
 [testenv:lint]
 description = Lint via pre-commit
 base_python = py{39,310,311,312,38,37}
-set_env =
-    SKIP = black-format
 commands = pre-commit run --all-files --hook-stage manual
 
 [testenv:mypy]