Commit d887a02

projectgusdpgeorge

authored and

committed

top: Bump the Ruff version to 0.11.6.

With small code fixes to match. Signed-off-by: Angus Gratton <angus@redyak.com.au>

1 parent f8c8875 commit d887a02Copy full SHA for d887a02

File tree

7 files changed

+14

-17

lines changed

.github/workflows
- ruff.yml
.pre-commit-config.yaml
micropython
- bluetooth/aioble/examples
  - l2cap_file_client.py
  - l2cap_file_server.py
- drivers
  - codec/wm8960
    - wm8960.py
  - display/lcd160cr
    - lcd160cr.py
pyproject.toml

7 files changed

+14

-17

lines changed

`‎.github/workflows/ruff.yml‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ jobs:`
`6`	`6`	`runs-on: ubuntu-latest`
`7`	`7`	`steps:`
`8`	`8`	`- uses: actions/checkout@v4`
`9`		`- - run: pip install --user ruff==0.1.2`
	`9`	`+ # Version should be kept in sync with .pre-commit_config.yaml & also micropython`
	`10`	`+ - run: pip install --user ruff==0.11.6`
`10`	`11`	`- run: ruff check --output-format=github .`
`11`	`12`	`- run: ruff format --diff .`

`‎.pre-commit-config.yaml‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ repos:`
`8`	`8`	`verbose: true`
`9`	`9`	`stages: [commit-msg]`
`10`	`10`	`- repo: https://github.com/charliermarsh/ruff-pre-commit`
`11`		`- rev: v0.1.2`
	`11`	`+ # Version should be kept in sync with .github/workflows/ruff.yml & also micropython`
	`12`	`+ rev: v0.11.6`
`12`	`13`	`hooks:`
`13`	`14`	`- id: ruff`
`14`	`15`	`id: ruff-format`

`‎micropython/bluetooth/aioble/examples/l2cap_file_client.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ async def download(self, path, dest):`
`88`	`88`
`89`	`89`	`await self._command(_COMMAND_SEND, path.encode())`
`90`	`90`
`91`		`- with open(dest, "wb") as f: # noqa: ASYNC101`
	`91`	`+ with open(dest, "wb") as f: # noqa: ASYNC230`
`92`	`92`	`total = 0`
`93`	`93`	`buf = bytearray(self._channel.our_mtu)`
`94`	`94`	`mv = memoryview(buf)`

`‎micropython/bluetooth/aioble/examples/l2cap_file_server.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ async def l2cap_task(connection):`
`83`	`83`
`84`	`84`	`if send_file:`
`85`	`85`	`print("Sending:", send_file)`
`86`		`- with open(send_file, "rb") as f: # noqa: ASYNC101`
	`86`	`+ with open(send_file, "rb") as f: # noqa: ASYNC230`
`87`	`87`	`buf = bytearray(channel.peer_mtu)`
`88`	`88`	`mv = memoryview(buf)`
`89`	`89`	`while n := f.readinto(buf):`

`‎micropython/drivers/codec/wm8960/wm8960.py‎`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -331,8 +331,7 @@ def __init__(`
`331`	`331`	`sysclk = 11289600`
`332`	`332`	`else:`
`333`	`333`	`sysclk = 12288000`
`334`		`- if sysclk < sample_rate * 256:`
`335`		`- sysclk = sample_rate * 256`
	`334`	`+ sysclk = max(sysclk, sample_rate * 256)`
`336`	`335`	`if mclk_freq is None:`
`337`	`336`	`mclk_freq = sysclk`
`338`	`337`	`else: # sysclk_source == SYSCLK_MCLK`
`@@ -691,10 +690,8 @@ def alc_mode(self, channel, mode=ALC_MODE):`
`691`	`690`	`def alc_gain(self, target=-12, max_gain=30, min_gain=-17.25, noise_gate=-78):`
`692`	`691`	`def limit(value, minval, maxval):`
`693`	`692`	`value = int(value)`
`694`		`- if value < minval:`
`695`		`- value = minval`
`696`		`- if value > maxval:`
`697`		`- value = maxval`
	`693`	`+ value = max(value, minval)`
	`694`	`+ value = min(value, maxval)`
`698`	`695`	`return value`
`699`	`696`
`700`	`697`	`target = limit((16 + (target * 2) // 3), 0, 15)`
`@@ -718,8 +715,7 @@ def logb(value, limit):`
`718`	`715`	`while value > 1:`
`719`	`716`	`value >>= 1`
`720`	`717`	`lb += 1`
`721`		`- if lb > limit:`
`722`		`- lb = limit`
	`718`	`+ lb = min(lb, limit)`
`723`	`719`	`return lb`
`724`	`720`
`725`	`721`	`attack = logb(attack / 6, 7)`

`‎micropython/drivers/display/lcd160cr/lcd160cr.py‎`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,8 @@ def clip_line(c, w, h):`
`189`	`189`	`c[3] = h - 1`
`190`	`190`	`else:`
`191`	`191`	`if c[0] == c[2]:`
`192`		`- if c[1] < 0:`
`193`		`- c[1] = 0`
`194`		`- if c[3] < 0:`
`195`		`- c[3] = 0`
	`192`	`+ c[1] = max(c[1], 0)`
	`193`	`+ c[3] = max(c[3], 0)`
`196`	`194`	`else:`
`197`	`195`	`if c[3] < c[1]:`
`198`	`196`	`c[0], c[2] = c[2], c[0]`

`‎pyproject.toml‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,15 @@ ignore = [`
`64`	`64`	`"ISC003", # micropython does not support implicit concatenation of f-strings`
`65`	`65`	`"PIE810", # micropython does not support passing tuples to .startswith or .endswith`
`66`	`66`	`"PLC1901",`
`67`		`- "PLR1701",`
	`67`	`+ "PLR1704", # sometimes desirable to redefine an argument to save code size`
`68`	`68`	`"PLR1714",`
`69`	`69`	`"PLR5501",`
`70`	`70`	`"PLW0602",`
`71`	`71`	`"PLW0603",`
`72`	`72`	`"PLW2901",`
`73`	`73`	`"RUF012",`
`74`	`74`	`"RUF100",`
	`75`	`+ "SIM101",`
`75`	`76`	`"W191", # tab-indent, redundant when using formatter`
`76`	`77`	`]`
`77`	`78`	`line-length = 99`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit d887a02

File tree

7 files changed

7 files changed

`‎.github/workflows/ruff.yml‎`

`‎.pre-commit-config.yaml‎`

`‎micropython/bluetooth/aioble/examples/l2cap_file_client.py‎`

`‎micropython/bluetooth/aioble/examples/l2cap_file_server.py‎`

`‎micropython/drivers/codec/wm8960/wm8960.py‎`

`‎micropython/drivers/display/lcd160cr/lcd160cr.py‎`

`‎pyproject.toml‎`

0 commit comments