Skip to content

Commit 7f010c6

Browse files
committed
Use ruff's isort implementation
1 parent b40f76d commit 7f010c6

File tree

3 files changed

+7
-45
lines changed

3 files changed

+7
-45
lines changed

.pre-commit-config.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ repos:
88
- id: end-of-file-fixer
99
- id: trailing-whitespace
1010
args: [--markdown-linebreak-ext=md]
11-
- repo: https://github.com/pycqa/isort
12-
rev: 5.12.0
13-
hooks:
14-
- id: isort
15-
name: isort (python)
1611
- repo: local
1712
hooks:
1813
- id: ruff

poetry.lock

+1-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+6-11
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ pydantic-settings = "2.0.2"
3434
[tool.poetry.dev-dependencies]
3535
coverage = "7.2.7"
3636
httpx = "0.24.1"
37-
isort = "5.12.0"
3837
pre-commit = "3.3.3"
3938
pip-licenses = "4.3.2"
4039
pytest = "7.4.0"
@@ -61,21 +60,12 @@ retest = "pytest -n auto --lf"
6160
test-cov = "pytest -n auto --cov-report= --cov"
6261
html = "coverage html"
6362
report = "coverage report"
64-
isort = "isort ."
6563

6664
[tool.coverage.run]
6765
branch = true
6866
source_pkgs = ["bot"]
6967
source = ["tests"]
7068

71-
[tool.isort]
72-
multi_line_output = 6
73-
order_by_type = false
74-
case_sensitive = true
75-
combine_as_imports = true
76-
line_length = 120
77-
atomic = true
78-
7969
[tool.ruff]
8070
target-version = "py311"
8171
extend-exclude = [".cache"]
@@ -92,7 +82,12 @@ ignore = [
9282
"SIM102", "SIM108",
9383
]
9484
line-length = 120
95-
select = ["ANN", "B", "C4", "D", "DTZ", "E", "F", "ISC", "INT", "N", "PGH", "PIE", "Q", "RET", "RSE", "RUF", "S", "SIM", "T20", "TID", "UP", "W"]
85+
select = ["ANN", "B", "C4", "D", "DTZ", "E", "F", "I", "ISC", "INT", "N", "PGH", "PIE", "Q", "RET", "RSE", "RUF", "S", "SIM", "T20", "TID", "UP", "W"]
86+
87+
[tool.ruff.isort]
88+
order-by-type = false
89+
case-sensitive = true
90+
combine-as-imports = true
9691

9792
[tool.ruff.per-file-ignores]
9893
"tests/*" = ["ANN", "D"]

0 commit comments

Comments
 (0)