Skip to main content

python: update to ruff v0.16; start reformatting files

ID
d4f3c81
date
2026-07-26 19:48:36+00:00
author
Alex Chan <alex@alexwlchan.net>
parent
c77abe6
message
python: update to ruff v0.16; start reformatting files
changed files
7 files, 8 additions, 13 deletions

Changed files

pythonstartup.py (882 → 797)

diff --git a/pythonstartup.py b/pythonstartup.py
index 6070f12..be71266 100644
--- a/pythonstartup.py
+++ b/pythonstartup.py
@@ -24,10 +24,8 @@ def displayhook_pprint(o):
     """
     if o is None:
         return
-    if sys.version_info[0] == 2:
-        import __builtin__ as builtins
-    else:
-        import builtins
+    import builtins
+
     # Set '_' to None to avoid recursion
     # https://docs.python.org/3/library/sys.html#sys.displayhook
     builtins._ = None

requirements.txt (1334 → 1369)

diff --git a/requirements.txt b/requirements.txt
index 4da649d..f90096e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # This file was autogenerated by uv via the following command:
-#    uv pip compile requirements.in --output-file=requirements.txt --exclude-newer=P7D --exclude-newer-package alexwlchan-chives=false
+#    uv pip compile requirements.in --output-file=requirements.txt --exclude-newer=P7D --exclude-newer-package alexwlchan-chives=false --exclude-newer-package ruff=false
 alexwlchan-chives==52
     # via -r requirements.in
 beautifulsoup4==4.14.3
@@ -41,7 +41,7 @@ pytest==9.0.3
     # via -r requirements.in
 requests==2.33.1
     # via yt-dlp
-ruff==0.15.9
+ruff==0.16.0
     # via -r requirements.in
 soupsieve==2.8.3
     # via beautifulsoup4

tailscale/devcontrol.py (3100 → 3099)

diff --git a/tailscale/devcontrol.py b/tailscale/devcontrol.py
index c6fcb6d..6a1a3e5 100755
--- a/tailscale/devcontrol.py
+++ b/tailscale/devcontrol.py
@@ -10,14 +10,13 @@ wraps them in a friendly interface.
 import argparse
 import atexit
 import os
-from pathlib import Path
 import subprocess
 import sys
+from pathlib import Path
 from typing import TypedDict
 
 from chives.text import coloured
 
-
 Args = TypedDict(
     "args",
     {

text/natsize.py (240 → 239)

diff --git a/text/natsize.py b/text/natsize.py
index 9ae2fe5..89cc417 100755
--- a/text/natsize.py
+++ b/text/natsize.py
@@ -11,6 +11,5 @@ import sys
 
 import humanize
 
-
 if __name__ == "__main__":
     print(humanize.naturalsize(sys.stdin.read()))

text/sumsizes.py (356 → 355)

diff --git a/text/sumsizes.py b/text/sumsizes.py
index abaa689..59609e6 100755
--- a/text/sumsizes.py
+++ b/text/sumsizes.py
@@ -13,7 +13,6 @@ import sys
 
 import humanize
 
-
 if __name__ == "__main__":
     total = sum(int(line) for line in sys.stdin.readlines())

web/scrape_really_useful_boxes.py (3959 → 3959)

diff --git a/web/scrape_really_useful_boxes.py b/web/scrape_really_useful_boxes.py
index 3b6b322..bd87e8f 100755
--- a/web/scrape_really_useful_boxes.py
+++ b/web/scrape_really_useful_boxes.py
@@ -11,9 +11,9 @@ database that I throw into datasette.
 See https://social.alexwlchan.net/@alex/111750446474991705
 """
 
-from collections.abc import Iterator
 import csv
 import time
+from collections.abc import Iterator
 from typing import TypedDict
 from urllib.parse import urljoin
 
@@ -69,7 +69,7 @@ def get_product_page_urls() -> Iterator[str]:
 
         if any(
             w in name.lower()
-            for w in {"tray", "set", "pack", "bauble insert", "bonus pack"}
+            for w in ("tray", "set", "pack", "bauble insert", "bonus pack")
         ):
             continue

web/yt-dlp.py (4022 → 4022)

diff --git a/web/yt-dlp.py b/web/yt-dlp.py
index 02d49c5..3644e8c 100755
--- a/web/yt-dlp.py
+++ b/web/yt-dlp.py
@@ -15,12 +15,12 @@ tool and it would work as-is.  It might check extra rules or run faster,
 but it should never download something different to the regular tool.
 """
 
-from collections.abc import Iterator
 import concurrent.futures
 import os
 import subprocess
 import sys
 import urllib.parse
+from collections.abc import Iterator
 
 import tqdm