isort → ruff (#9152)

Author: DimitriPapadopoulos

.pre-commit-config.yaml

@@ -3,11 +3,6 @@ repos:
     rev: v0.14.5
     hooks:
       - id: ruff-check
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        language_version: python3
   - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 25.11.0
     hooks:

distributed/utils.py

@@ -46,9 +46,8 @@
 from pickle import PickleBuffer
 from time import sleep
 from types import ModuleType
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, ClassVar, TypeVar, overload
 from typing import Any as AnyType
-from typing import ClassVar, TypeVar, overload
 
 import psutil
 import tblib.pickling_support
@@ -67,9 +66,8 @@
 from tornado.ioloop import IOLoop
 
 import dask
-from dask.utils import _deprecated
+from dask.utils import _deprecated, key_split
 from dask.utils import ensure_bytes as _ensure_bytes
-from dask.utils import key_split
 from dask.utils import parse_timedelta as _parse_timedelta
 from dask.widgets import get_template
 

distributed/utils_test.py

@@ -80,9 +80,9 @@
     InvalidTransition,
     SecedeEvent,
     StateMachineEvent,
+    WorkerState,
 )
 from distributed.worker_state_machine import TaskState as WorkerTaskState
-from distributed.worker_state_machine import WorkerState
 
 try:
     import dask.array  # register config

distributed/worker.py

@@ -75,9 +75,9 @@
     context_meter_to_server_digest,
     error_message,
     pingpong,
+    send_recv,
 )
 from distributed.core import rpc as RPCType
-from distributed.core import send_recv
 from distributed.diagnostics import nvml, rmm
 from distributed.diagnostics.plugin import WorkerPlugin, _get_plugin_name
 from distributed.diskutils import WorkSpace

pyproject.toml

@@ -80,6 +80,7 @@ line-length = 120
 extend-select = [
     "B",
     "TID",
+    "I",
     "UP",
 ]
 ignore = [
@@ -101,15 +102,11 @@ ignore = [
 "distributed/shuffle/tests/test_shuffle.py" = ["F601"]
 "distributed/utils.py" = ["F821"]
 
-[tool.isort]
-sections = ["FUTURE", "STDLIB", "THIRDPARTY", "DISTRIBUTED", "FIRSTPARTY", "LOCALFOLDER"]
-profile = "black"
-skip_gitignore = true
-force_to_top = ["true"]
-default_section = "THIRDPARTY"
-known_first_party = ["distributed"]
-known_distributed = ["dask", "zict"]
-add_imports = ["from __future__ import annotations"]
+[tool.ruff.lint.isort]
+section-order = ["future", "standard-library", "third-party", "distributed", "first-party", "local-folder"]
+
+[tool.ruff.lint.isort.sections]
+"distributed" = ["dask", "zict"]
 
 [tool.setuptools_scm]
 version_file = "distributed/_version.py"