Skip to content

Commit 529d516

Browse files
pombredanneJonoYang
authored andcommitted
Improve import sorting
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
1 parent eb5fc82 commit 529d516

7 files changed

+15
-16
lines changed

etc/scripts/check_thirdparty.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import utils_thirdparty
1414

15-
1615
@click.command()
1716
@click.option(
1817
"-d",

etc/scripts/fetch_thirdparty.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import click
1818

19-
import utils_thirdparty
2019
import utils_requirements
20+
import utils_thirdparty
2121

2222
TRACE = False
2323
TRACE_DEEP = False

etc/scripts/test_utils_pip_compatibility_tags.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2626
"""
2727

28-
from unittest.mock import patch
2928
import sysconfig
29+
from unittest.mock import patch
3030

3131
import pytest
3232

3333
import utils_pip_compatibility_tags
3434

35-
3635
@pytest.mark.parametrize(
3736
"version_info, expected",
3837
[

etc/scripts/utils_dejacode.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
import requests
1616
import saneyaml
17-
1817
from packvers import version as packaging_version
1918

2019
"""

etc/scripts/utils_pip_compatibility_tags.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@
2727

2828
import re
2929

30-
from packvers.tags import (
31-
compatible_tags,
32-
cpython_tags,
33-
generic_tags,
34-
interpreter_name,
35-
interpreter_version,
36-
mac_platforms,
37-
)
30+
from packvers.tags import compatible_tags
31+
from packvers.tags import cpython_tags
32+
from packvers.tags import generic_tags
33+
from packvers.tags import interpreter_name
34+
from packvers.tags import interpreter_version
35+
from packvers.tags import mac_platforms
3836

3937
_osx_arch_pat = re.compile(r"(.+)_(\d+)_(\d+)_(.+)")
4038

etc/scripts/utils_thirdparty.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
import packageurl
2626
import requests
2727
import saneyaml
28+
import utils_pip_compatibility_tags
2829
from commoncode import fileutils
2930
from commoncode.hash import multi_checksums
3031
from commoncode.text import python_safe_name
3132
from packvers import tags as packaging_tags
3233
from packvers import version as packaging_version
3334

34-
import utils_pip_compatibility_tags
35-
3635
"""
3736
Utilities to manage Python thirparty libraries source, binaries and metadata in
3837
local directories and remote repositories.

pyproject.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,15 @@ select = [
7676
"I", # isort
7777
"C9", # McCabe complexity
7878
]
79-
ignore = ["D1", "D203", "D205", "D212", "D400", "D415"]
79+
ignore = ["D1", "D200", "D203", "D205", "D212", "D400", "D415"]
8080

8181
[tool.ruff.lint.isort]
8282
force-single-line = true
83+
lines-after-imports = 1
84+
default-section = "first-party"
85+
known-first-party = ["src", "tests", "etc/scripts/**/*.py"]
86+
known-third-party = ["click", "pytest"]
87+
8388
sections = { django = ["django"] }
8489
section-order = [
8590
"future",

0 commit comments

Comments
 (0)