Migrate from black to ruff format (#9295)

Author: crusaderky

.pre-commit-config.yaml

@@ -1,13 +1,10 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.2
+    rev: v0.15.16
     hooks:
       - id: ruff-check
         # args: [--fix]
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.3.1
-    hooks:
-      - id: black
+      - id: ruff-format
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.2
     hooks:

continuous_integration/scripts/test_report.py

@@ -394,9 +394,9 @@ def download_and_parse_artifacts(
                 # the same workflow run can be aligned according to the same trigger
                 # time.
                 html_url = jobs_df[jobs_df["suite_name"] == a["name"]].html_url.unique()
-                assert (
-                    len(html_url) == 1
-                ), f"Artifact suite name {a['name']} did not match any jobs dataframe:\n{jobs_df['suite_name'].unique()}"
+                assert len(html_url) == 1, (
+                    f"Artifact suite name {a['name']} did not match any jobs dataframe:\n{jobs_df['suite_name'].unique()}"
+                )
                 html_url = html_url[0]
                 assert html_url is not None
                 df2 = df.assign(

distributed/cli/dask_worker.py

@@ -381,8 +381,8 @@ def del_pid_file():
         and dask.config.get("scheduler-address", None) is None
     ):
         raise ValueError(
-            "Need to provide scheduler address like\n"
-            "dask worker SCHEDULER_ADDRESS:8786"
+            "Need to provide scheduler address like "
+            "`dask worker SCHEDULER_ADDRESS:8786`"
         )
 
     with suppress(TypeError, ValueError):

distributed/cli/tests/test_dask_worker.py

@@ -29,7 +29,8 @@
 
 @pytest.mark.parametrize(
     # args: (worker_port, nanny_port, n_workers, nanny)
-    # Passing *args tuple instead of single args is to improve readability with black
+    # Passing *args tuple instead of single args is to improve readability
+    # with ruff format
     "args,expect",
     [
         # Single worker

distributed/client.py

@@ -1542,8 +1542,7 @@ async def _reconnect(self):
 
         else:
             logger.error(
-                "Failed to reconnect to scheduler after %.2f "
-                "seconds, closing client",
+                "Failed to reconnect to scheduler after %.2f seconds, closing client",
                 self._timeout,
             )
             await self._close()
@@ -3137,8 +3136,7 @@ async def _run(
                 results[key] = exc
             elif on_error != "ignore":
                 raise ValueError(
-                    "on_error must be 'raise', 'return', or 'ignore'; "
-                    f"got {on_error!r}"
+                    f"on_error must be 'raise', 'return', or 'ignore'; got {on_error!r}"
                 )
 
         if wait:
@@ -3922,13 +3920,13 @@ async def _restart_workers(
         name_to_addr = {meta["name"]: addr for addr, meta in info["workers"].items()}
         worker_addrs = [name_to_addr.get(w, w) for w in workers]
 
-        out: dict[str, Literal["OK", "removed", "timed out"]] = (
-            await self.scheduler.restart_workers(
-                workers=worker_addrs,
-                timeout=timeout,
-                on_error="raise" if raise_for_error else "return",
-                stimulus_id=f"client-restart-workers-{time()}",
-            )
+        out: dict[
+            str, Literal["OK", "removed", "timed out"]
+        ] = await self.scheduler.restart_workers(
+            workers=worker_addrs,
+            timeout=timeout,
+            on_error="raise" if raise_for_error else "return",
+            stimulus_id=f"client-restart-workers-{time()}",
         )
         # Map keys back to original `workers` input names/addresses
         out = {w: out[w_addr] for w, w_addr in zip(workers, worker_addrs)}

distributed/comm/addressing.py

@@ -200,8 +200,7 @@ def uri_from_host_port(
     # Note `port = 0` means "choose a random port"
     if port != 0 and port_arg and port != int(port_arg):
         raise ValueError(
-            "port number given twice in options: "
-            f"host {host_arg} and port {port_arg}"
+            f"port number given twice in options: host {host_arg} and port {port_arg}"
         )
 
     loc = unparse_host_port(host, port)

distributed/dashboard/tests/test_scheduler_bokeh.py

@@ -1139,9 +1139,9 @@ async def test_proxy_to_workers(s, a, b):
         proxy_url = f"http://localhost:{dashboard_port}/proxy/1234/{unsafe_host}/status"
         response = await http_client.fetch(proxy_url, raise_error=False)
         assert response.code == 400
-        assert (
-            unsafe_host not in response.body.decode()
-        ), "Unsafe characters should be escaped"
+        assert unsafe_host not in response.body.decode(), (
+            "Unsafe characters should be escaped"
+        )
 
 
 @gen_cluster(

distributed/deploy/tests/test_local.py

@@ -770,8 +770,7 @@ async def test_adapt_then_manual():
 
         def wait_workers(n):
             return async_poll_for(
-                lambda: len(cluster.scheduler.workers) == n
-                and len(cluster.workers) == n
+                lambda: len(cluster.scheduler.workers) == len(cluster.workers) == n
             )
 
         await wait_workers(8)

distributed/diagnostics/memray.py

@@ -58,9 +58,9 @@ def _fetch_memray_profile(
     if not report_args[0] == "memray":
         report_args = ["memray"] + list(report_args)
     assert "-f" not in report_args, "Cannot provide filename for report generation"
-    assert (
-        "-o" not in report_args
-    ), "Cannot provide output filename for report generation"
+    assert "-o" not in report_args, (
+        "Cannot provide output filename for report generation"
+    )
     report_args = list(report_args) + ["-f", str(path), "-o", str(report_filename)]
     subprocess.run(report_args)
     with open(report_filename, "rb") as fd:

distributed/diagnostics/progressbar.py

@@ -417,7 +417,8 @@ def _draw_bar(self, remaining, all, status, **kwargs):
             )
             self.bars[k].value = ndone / ntasks if ntasks else 1.0
             self.bar_texts[k].value = (
-                f'<div style="padding: 0px 10px 0px 10px; text-align: right">{ndone} / {ntasks}</div>'
+                f'<div style="padding: 0px 10px 0px 10px; text-align: right">'
+                f"{ndone} / {ntasks}</div>"
             )