Use ruff for import sorting as well

Author: pfmoore

.pre-commit-config.yaml

@@ -27,12 +27,6 @@ repos:
   hooks:
     - id: ruff
 
-- repo: https://github.com/PyCQA/isort
-  rev: 5.12.0
-  hooks:
-  - id: isort
-    files: \.py$
-
 - repo: https://github.com/pre-commit/mirrors-mypy
   rev: v0.961
   hooks:

pyproject.toml

@@ -94,8 +94,15 @@ select = [
     "W",
     "G",
     "ISC",
+    "I",
 ]
 
 [tool.ruff.per-file-ignores]
 "noxfile.py" = ["G"]
 "tests/*" = ["B011"]
+
+[tool.ruff.isort]
+# We need to explicitly make pip "first party" as it's imported by code in
+# the docs and tests directories.
+known-first-party = ["pip"]
+known-third-party = ["pip._vendor"]

tests/functional/test_install_compat.py

@@ -7,8 +7,12 @@
 
 import pytest
 
-from tests.lib import pyversion  # noqa: F401
-from tests.lib import PipTestEnvironment, TestData, assert_all_changes
+from tests.lib import (
+    PipTestEnvironment,
+    TestData,
+    assert_all_changes,
+    pyversion,  # noqa: F401
+)
 
 
 @pytest.mark.network

tests/functional/test_install_upgrade.py

@@ -6,8 +6,13 @@
 
 import pytest
 
-from tests.lib import pyversion  # noqa: F401
-from tests.lib import PipTestEnvironment, ResolverVariant, TestData, assert_all_changes
+from tests.lib import (
+    PipTestEnvironment,
+    ResolverVariant,
+    TestData,
+    assert_all_changes,
+    pyversion,  # noqa: F401
+)
 from tests.lib.local_repos import local_checkout
 from tests.lib.wheel import make_wheel
 

tests/functional/test_install_user.py

@@ -8,12 +8,12 @@
 
 import pytest
 
-from tests.lib import pyversion  # noqa: F401
 from tests.lib import (
     PipTestEnvironment,
     TestData,
     create_basic_wheel_for_package,
     need_svn,
+    pyversion,  # noqa: F401
 )
 from tests.lib.local_repos import local_checkout
 from tests.lib.venv import VirtualEnvironment

tests/functional/test_install_vcs_git.py

@@ -3,11 +3,11 @@
 
 import pytest
 
-from tests.lib import pyversion  # noqa: F401
 from tests.lib import (
     PipTestEnvironment,
     _change_test_package_version,
     _create_test_package,
+    pyversion,  # noqa: F401
 )
 from tests.lib.git_submodule_helpers import (
     _change_test_package_submodule,

tests/functional/test_wheel.py

@@ -7,8 +7,11 @@
 import pytest
 
 from pip._internal.cli.status_codes import ERROR
-from tests.lib import pyversion  # noqa: F401
-from tests.lib import PipTestEnvironment, TestData
+from tests.lib import (
+    PipTestEnvironment,
+    TestData,
+    pyversion,  # noqa: F401
+)
 
 
 def add_files_to_dist_directory(folder: Path) -> None: