Skip to content

Commit 110f921

Browse files
authored
Merge pull request #1150 from scop/style/more-ruff
style(ruff): more, simplify config
2 parents 227eaeb + 29cb240 commit 110f921

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

pyproject.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tool.ruff]
22
line-length = 79
33
target-version = "py37"
4-
lint.select = ["E", "F", "B"]
4+
lint.select = ["E", "F", "B", "I"]
55
lint.ignore = [
66
# https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
77
# (keep order of ignores here same as ^there for maintainability)
@@ -21,8 +21,6 @@ lint.ignore = [
2121
"ISC002",
2222
"E501",
2323
]
24+
lint.isort.known-first-party = ["conftest"]
25+
lint.isort.known-third-party = ["pexpect", "pytest"]
2426
fix = true
25-
26-
[tool.ruff.lint.isort]
27-
known-first-party = ["conftest"]
28-
known-third-party = ["pexpect", "pytest"]

test/t/test_java.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import pytest
22

3-
from conftest import is_bash_type, assert_bash_exec, bash_env_saved
3+
from conftest import assert_bash_exec, bash_env_saved, is_bash_type
44

55

66
@pytest.mark.bashcomp(

test/t/unit/test_unit_compgen.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import pytest
21
import re
32

4-
from conftest import assert_bash_exec, bash_env_saved, assert_complete
3+
import pytest
4+
5+
from conftest import assert_bash_exec, assert_complete, bash_env_saved
56

67

78
@pytest.mark.bashcomp(cmd=None)

test/t/unit/test_unit_load.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import pytest
21
import os
32

3+
import pytest
4+
45
from conftest import assert_bash_exec, bash_env_saved, prepare_fixture_dir
56

67

0 commit comments

Comments
 (0)