resolving conflicts between isort and black

.pre-commit-config.yaml

@@ -31,9 +31,9 @@ repos:
     rev: 5.12.0
     hooks:
       - id: isort
-        args: ["--profile", "black"]
+        name: isort (python)
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 22.10.0
     hooks:
       - id: black
         language_version: python3.10

docly/cmdline.py

@@ -2,10 +2,10 @@
 
 import click
 from click import Context
-from docly.log import init_log
 
 from docly import __version__
 from docly.config import settings
+from docly.log import init_log
 
 
 @click.group(invoke_without_command=True)

docly/core/detection/dbnet.py

@@ -236,7 +236,7 @@ def __init__(
         use_dilation=False,
         score_mode="fast",
         box_type="quad",
-        **kwargs
+        **kwargs,
     ):
         self.thresh = thresh
         self.box_thresh = box_thresh

docly/core/detection/yolov8 copy.py

@@ -7,9 +7,9 @@
 import cv2
 import numpy as np
 import onnxruntime as ort
-from docly.utils import visual
 
 from docly.config import __model_path__
+from docly.utils import visual
 
 
 class YOLOv8:

pyproject.toml

@@ -51,4 +51,31 @@ testpaths = "tests"
 python_files = "tests.py test_*.py *_tests.py"
 
 [tool.pylint.design]
-max-line-length = 120
+max-line-length = 120
+
+[tool.isort]
+profile = "black"
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+line_length = 88
+
+[tool.black]
+line-length = 88
+target-version = ['py310']
+include = '\.pyi?$'
+extend-exclude = '''
+/(
+  # directories
+  \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | build
+  | dist
+)/
+'''

tox.ini

@@ -4,6 +4,7 @@ envlist =
     py310
     isort
     pylint
+    lint
 
 [testenv]
 deps =
@@ -24,3 +25,11 @@ changedir = {toxinidir}
 commands =
     poetry install -v
     poetry run pylint tests docly
+
+[testenv:lint]
+deps =
+    isort
+    black
+commands =
+    isort .
+    black .