Skip to content

Commit b0ebea9

Browse files
authored
Merge pull request #12974 from notatallshaw/vendored-and-test-import-groups
Add vendored and test import groups to import sorting
2 parents 6c3943b + 43cc291 commit b0ebea9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+95
-4
lines changed

news/12974.trivial.rst

Lines changed: 1 addition & 0 deletions

pyproject.toml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,19 @@ select = [
186186
]
187187

188188
[tool.ruff.lint.isort]
189-
# Explicitly make tests "first party" as it's not in the "src" directory
190-
known-first-party = ["tests"]
191-
known-third-party = ["pip._vendor"]
189+
section-order = [
190+
"future",
191+
"standard-library",
192+
"third-party",
193+
"vendored",
194+
"first-party",
195+
"tests",
196+
"local-folder",
197+
]
198+
199+
[tool.ruff.lint.isort.sections]
200+
"vendored" = ["pip._vendor"]
201+
"tests" = ["tests"]
192202

193203
[tool.ruff.lint.mccabe]
194204
max-complexity = 33 # default is 10

tests/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
from pip import __file__ as pip_location
4848
from pip._internal.locations import _USE_SYSCONFIG
4949
from pip._internal.utils.temp_dir import global_tempdir_manager
50+
5051
from tests.lib import (
5152
DATA_DIR,
5253
SRC_DIR,

tests/functional/test_build_env.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import pytest
77

88
from pip._internal.build_env import BuildEnvironment, _get_system_sitepackages
9+
910
from tests.lib import (
1011
PipTestEnvironment,
1112
TestPipResult,

tests/functional/test_cli.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import pytest
1010

1111
from pip._internal.commands import commands_dict
12+
1213
from tests.lib import PipTestEnvironment
1314

1415

tests/functional/test_config_settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from zipfile import ZipFile
66

77
from pip._internal.utils.urls import path_to_url
8+
89
from tests.lib import PipTestEnvironment, create_basic_sdist_for_package
910

1011
PYPROJECT_TOML = """\

tests/functional/test_configuration.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from pip._internal.cli.status_codes import ERROR
88
from pip._internal.configuration import CONFIG_BASENAME, get_configuration_files
9+
910
from tests.lib import PipTestEnvironment
1011
from tests.lib.configuration_helpers import ConfigurationMixin, kinds
1112
from tests.lib.venv import VirtualEnvironment

tests/functional/test_debug.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
from typing import List
33

44
import pytest
5+
56
from pip._vendor.packaging.version import Version
67

78
from pip._internal.commands.debug import create_vendor_txt_map
89
from pip._internal.utils import compatibility_tags
10+
911
from tests.lib import PipTestEnvironment
1012

1113

tests/functional/test_download.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from pip._internal.cli.status_codes import ERROR
1313
from pip._internal.utils.urls import path_to_url
14+
1415
from tests.lib import (
1516
PipTestEnvironment,
1617
ScriptFactory,

tests/functional/test_fast_deps.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
from typing import Iterable
88

99
import pytest
10+
1011
from pip._vendor.packaging.utils import canonicalize_name
1112

1213
from pip._internal.utils.misc import hash_file
14+
1315
from tests.lib import PipTestEnvironment, TestData, TestPipResult
1416

1517

0 commit comments

Comments
 (0)