From d887a021e831ee3b7e6f00f6a4c32b36ee6c4769 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 24 Apr 2025 10:41:10 +1000
Subject: [PATCH] top: Bump the Ruff version to 0.11.6.

With small code fixes to match.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .github/workflows/ruff.yml                           |  3 ++-
 .pre-commit-config.yaml                              |  3 ++-
 .../bluetooth/aioble/examples/l2cap_file_client.py   |  2 +-
 .../bluetooth/aioble/examples/l2cap_file_server.py   |  2 +-
 micropython/drivers/codec/wm8960/wm8960.py           | 12 ++++--------
 micropython/drivers/display/lcd160cr/lcd160cr.py     |  6 ++----
 pyproject.toml                                       |  3 ++-
 7 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
index 71c4131f..b347e34e 100644
--- a/.github/workflows/ruff.yml
+++ b/.github/workflows/ruff.yml
@@ -6,6 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: pip install --user ruff==0.1.2
+    # Version should be kept in sync with .pre-commit_config.yaml & also micropython
+    - run: pip install --user ruff==0.11.6
     - run: ruff check --output-format=github .
     - run: ruff format --diff .
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 335c1c2f..05f5d3df 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,8 @@ repos:
         verbose: true
         stages: [commit-msg]
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.2
+    # Version should be kept in sync with .github/workflows/ruff.yml & also micropython
+    rev: v0.11.6
     hooks:
       - id: ruff
         id: ruff-format
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_client.py b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
index 9dce349a..0817ca16 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_client.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_client.py
@@ -88,7 +88,7 @@ class FileClient:
 
         await self._command(_COMMAND_SEND, path.encode())
 
-        with open(dest, "wb") as f:  # noqa: ASYNC101
+        with open(dest, "wb") as f:  # noqa: ASYNC230
             total = 0
             buf = bytearray(self._channel.our_mtu)
             mv = memoryview(buf)
diff --git a/micropython/bluetooth/aioble/examples/l2cap_file_server.py b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
index fb806eff..3c3b3b44 100644
--- a/micropython/bluetooth/aioble/examples/l2cap_file_server.py
+++ b/micropython/bluetooth/aioble/examples/l2cap_file_server.py
@@ -83,7 +83,7 @@ async def l2cap_task(connection):
 
             if send_file:
                 print("Sending:", send_file)
-                with open(send_file, "rb") as f:  # noqa: ASYNC101
+                with open(send_file, "rb") as f:  # noqa: ASYNC230
                     buf = bytearray(channel.peer_mtu)
                     mv = memoryview(buf)
                     while n := f.readinto(buf):
diff --git a/micropython/drivers/codec/wm8960/wm8960.py b/micropython/drivers/codec/wm8960/wm8960.py
index dc0dd655..313649f3 100644
--- a/micropython/drivers/codec/wm8960/wm8960.py
+++ b/micropython/drivers/codec/wm8960/wm8960.py
@@ -331,8 +331,7 @@ class WM8960:
                 sysclk = 11289600
             else:
                 sysclk = 12288000
-            if sysclk < sample_rate * 256:
-                sysclk = sample_rate * 256
+            sysclk = max(sysclk, sample_rate * 256)
             if mclk_freq is None:
                 mclk_freq = sysclk
         else:  # sysclk_source == SYSCLK_MCLK
@@ -691,10 +690,8 @@ class WM8960:
     def alc_gain(self, target=-12, max_gain=30, min_gain=-17.25, noise_gate=-78):
         def limit(value, minval, maxval):
             value = int(value)
-            if value < minval:
-                value = minval
-            if value > maxval:
-                value = maxval
+            value = max(value, minval)
+            value = min(value, maxval)
             return value
 
         target = limit((16 + (target * 2) // 3), 0, 15)
@@ -718,8 +715,7 @@ class WM8960:
             while value > 1:
                 value >>= 1
                 lb += 1
-            if lb > limit:
-                lb = limit
+            lb = min(lb, limit)
             return lb
 
         attack = logb(attack / 6, 7)
diff --git a/micropython/drivers/display/lcd160cr/lcd160cr.py b/micropython/drivers/display/lcd160cr/lcd160cr.py
index 42b5e215..177c6fea 100644
--- a/micropython/drivers/display/lcd160cr/lcd160cr.py
+++ b/micropython/drivers/display/lcd160cr/lcd160cr.py
@@ -189,10 +189,8 @@ class LCD160CR:
                         c[3] = h - 1
                 else:
                     if c[0] == c[2]:
-                        if c[1] < 0:
-                            c[1] = 0
-                        if c[3] < 0:
-                            c[3] = 0
+                        c[1] = max(c[1], 0)
+                        c[3] = max(c[3], 0)
                     else:
                         if c[3] < c[1]:
                             c[0], c[2] = c[2], c[0]
diff --git a/pyproject.toml b/pyproject.toml
index 4776ddfe..83d29405 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -64,7 +64,7 @@ ignore = [
   "ISC003",  # micropython does not support implicit concatenation of f-strings
   "PIE810",  # micropython does not support passing tuples to .startswith or .endswith
   "PLC1901",
-  "PLR1701",
+  "PLR1704",  # sometimes desirable to redefine an argument to save code size
   "PLR1714",
   "PLR5501",
   "PLW0602",
@@ -72,6 +72,7 @@ ignore = [
   "PLW2901",
   "RUF012",
   "RUF100",
+  "SIM101",
   "W191",  # tab-indent, redundant when using formatter
 ]
 line-length = 99