Skip to content

Commit 84efe44

Browse files
hfudevhfudev
committed
bump: update pre-commit and some related configs
1 parent eb7ad2b commit 84efe44

File tree

8 files changed

+149
-108
lines changed

8 files changed

+149
-108
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,18 @@ exclude: |
88
99
repos:
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
11-
rev: v5.0.0
11+
rev: v6.0.0
1212
hooks:
1313
- id: trailing-whitespace
1414
- id: end-of-file-fixer
1515
- id: mixed-line-ending
1616
args: ["-f=lf"]
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: "v0.11.6"
18+
rev: "v0.12.12"
1919
hooks:
20-
- id: ruff
20+
- id: ruff-check
2121
args: ["--fix"]
2222
- id: ruff-format
23-
args: ["--preview"]
2423

2524
# documentation
2625
- repo: https://github.com/sphinx-contrib/sphinx-lint

‎pytest-embedded-idf/pytest_embedded_idf/serial.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,12 @@ def _force_flag(self, app: Optional[IdfApp] = None):
116116
if app is None:
117117
app = self.app
118118

119-
if any((
120-
app.sdkconfig.get('SECURE_FLASH_ENC_ENABLED', False),
121-
app.sdkconfig.get('SECURE_BOOT', False),
122-
)):
119+
if any(
120+
(
121+
app.sdkconfig.get('SECURE_FLASH_ENC_ENABLED', False),
122+
app.sdkconfig.get('SECURE_BOOT', False),
123+
)
124+
):
123125
return ['--force']
124126

125127
return []

‎pytest-embedded-idf/pytest_embedded_idf/utils.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ def _expand_target_values(values: t.List[t.List[t.Any]], target_index: int) -> t
2424
for value in values:
2525
target = value[target_index]
2626
if target == 'supported_targets':
27-
expanded_values.extend([
28-
value[:target_index] + [target] + value[target_index + 1 :] for target in supported_targets.get()
29-
])
27+
expanded_values.extend(
28+
[[*value[:target_index], target, *value[target_index + 1 :]] for target in supported_targets.get()]
29+
)
3030
elif target == 'preview_targets':
31-
expanded_values.extend([
32-
value[:target_index] + [target] + value[target_index + 1 :] for target in preview_targets.get()
33-
])
31+
expanded_values.extend(
32+
[[*value[:target_index], target, *value[target_index + 1 :]] for target in preview_targets.get()]
33+
)
3434
else:
3535
expanded_values.append(value)
3636
return expanded_values

‎pytest-embedded-jtag/pytest_embedded_jtag/openocd.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,16 @@ def __init__(
4343
self.telnet_port = self.TELNET_BASE_PORT + port_offset
4444
self.gdb_port = self.GDB_BASE_PORT + port_offset
4545

46-
openocd_cli_args.extend([
47-
'-c',
48-
f'tcl_port {self.tcl_port}',
49-
'-c',
50-
f'telnet_port {self.telnet_port}',
51-
'-c',
52-
f'gdb_port {self.gdb_port}',
53-
])
46+
openocd_cli_args.extend(
47+
[
48+
'-c',
49+
f'tcl_port {self.tcl_port}',
50+
'-c',
51+
f'telnet_port {self.telnet_port}',
52+
'-c',
53+
f'gdb_port {self.gdb_port}',
54+
]
55+
)
5456

5557
super().__init__(cmd=[openocd_prog_path, *openocd_cli_args], **kwargs)
5658

‎pytest-embedded/pytest_embedded/dut_factory.py‎

Lines changed: 89 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -173,22 +173,26 @@ def _fixture_classes_and_options_fn(
173173
from pytest_embedded_qemu import DEFAULT_IMAGE_FN, QemuApp
174174

175175
classes[fixture] = QemuApp
176-
kwargs[fixture].update({
177-
'msg_queue': msg_queue,
178-
'part_tool': part_tool,
179-
'qemu_image_path': qemu_image_path,
180-
'skip_regenerate_image': skip_regenerate_image,
181-
'encrypt': encrypt,
182-
'keyfile': keyfile,
183-
'qemu_prog_path': qemu_prog_path,
184-
})
176+
kwargs[fixture].update(
177+
{
178+
'msg_queue': msg_queue,
179+
'part_tool': part_tool,
180+
'qemu_image_path': qemu_image_path,
181+
'skip_regenerate_image': skip_regenerate_image,
182+
'encrypt': encrypt,
183+
'keyfile': keyfile,
184+
'qemu_prog_path': qemu_prog_path,
185+
}
186+
)
185187
else:
186188
from pytest_embedded_idf import IdfApp
187189

188190
classes[fixture] = IdfApp
189-
kwargs[fixture].update({
190-
'part_tool': part_tool,
191-
})
191+
kwargs[fixture].update(
192+
{
193+
'part_tool': part_tool,
194+
}
195+
)
192196
elif 'arduino' in _services:
193197
from pytest_embedded_arduino import ArduinoApp
194198

@@ -226,26 +230,32 @@ def _fixture_classes_and_options_fn(
226230
from pytest_embedded_idf import IdfSerial
227231

228232
classes[fixture] = IdfSerial
229-
kwargs[fixture].update({
230-
'app': None,
231-
'confirm_target_elf_sha256': confirm_target_elf_sha256,
232-
'erase_nvs': erase_nvs,
233-
})
233+
kwargs[fixture].update(
234+
{
235+
'app': None,
236+
'confirm_target_elf_sha256': confirm_target_elf_sha256,
237+
'erase_nvs': erase_nvs,
238+
}
239+
)
234240
elif 'arduino' in _services:
235241
from pytest_embedded_arduino import ArduinoSerial
236242

237243
classes[fixture] = ArduinoSerial
238-
kwargs[fixture].update({
239-
'app': None,
240-
})
244+
kwargs[fixture].update(
245+
{
246+
'app': None,
247+
}
248+
)
241249
elif 'nuttx' in _services:
242250
from pytest_embedded_nuttx import NuttxSerial
243251

244252
classes[fixture] = NuttxSerial
245-
kwargs[fixture].update({
246-
'app': None,
247-
'baud': int(baud or NuttxSerial.SERIAL_BAUDRATE),
248-
})
253+
kwargs[fixture].update(
254+
{
255+
'app': None,
256+
'baud': int(baud or NuttxSerial.SERIAL_BAUDRATE),
257+
}
258+
)
249259
else:
250260
from pytest_embedded_serial_esp import EspSerial
251261

@@ -312,16 +322,18 @@ def _fixture_classes_and_options_fn(
312322
from pytest_embedded_wokwi import WokwiCLI
313323

314324
classes[fixture] = WokwiCLI
315-
kwargs[fixture].update({
316-
'wokwi_cli_path': wokwi_cli_path,
317-
'wokwi_timeout': wokwi_timeout,
318-
'wokwi_scenario': wokwi_scenario,
319-
'wokwi_diagram': wokwi_diagram,
320-
'msg_queue': msg_queue,
321-
'app': None,
322-
'meta': _meta,
323-
'firmware_resolver': None,
324-
})
325+
kwargs[fixture].update(
326+
{
327+
'wokwi_cli_path': wokwi_cli_path,
328+
'wokwi_timeout': wokwi_timeout,
329+
'wokwi_scenario': wokwi_scenario,
330+
'wokwi_diagram': wokwi_diagram,
331+
'msg_queue': msg_queue,
332+
'app': None,
333+
'meta': _meta,
334+
'firmware_resolver': None,
335+
}
336+
)
325337
elif fixture == 'dut':
326338
classes[fixture] = Dut
327339
kwargs[fixture] = {
@@ -342,9 +354,11 @@ def _fixture_classes_and_options_fn(
342354
from pytest_embedded_wokwi import WokwiDut
343355

344356
classes[fixture] = WokwiDut
345-
kwargs[fixture].update({
346-
'wokwi': None,
347-
})
357+
kwargs[fixture].update(
358+
{
359+
'wokwi': None,
360+
}
361+
)
348362

349363
if 'idf' in _services:
350364
from pytest_embedded_wokwi.idf import IDFFirmwareResolver
@@ -361,16 +375,20 @@ def _fixture_classes_and_options_fn(
361375
from pytest_embedded_nuttx import NuttxQemuDut
362376

363377
classes[fixture] = NuttxQemuDut
364-
kwargs[fixture].update({
365-
'qemu': None,
366-
})
378+
kwargs[fixture].update(
379+
{
380+
'qemu': None,
381+
}
382+
)
367383
else:
368384
from pytest_embedded_qemu import QemuDut
369385

370386
classes[fixture] = QemuDut
371-
kwargs[fixture].update({
372-
'qemu': None,
373-
})
387+
kwargs[fixture].update(
388+
{
389+
'qemu': None,
390+
}
391+
)
374392
elif 'jtag' in _services:
375393
if 'idf' in _services:
376394
from pytest_embedded_idf import IdfDut
@@ -381,42 +399,52 @@ def _fixture_classes_and_options_fn(
381399

382400
classes[fixture] = SerialDut
383401

384-
kwargs[fixture].update({
385-
'serial': None,
386-
'openocd': None,
387-
'gdb': None,
388-
})
402+
kwargs[fixture].update(
403+
{
404+
'serial': None,
405+
'openocd': None,
406+
'gdb': None,
407+
}
408+
)
389409
elif 'serial' in _services or 'esp' in _services:
390410
if 'esp' in _services and 'idf' in _services:
391411
from pytest_embedded_idf import IdfDut
392412

393413
classes[fixture] = IdfDut
394-
kwargs[fixture].update({
395-
'skip_check_coredump': skip_check_coredump,
396-
'panic_output_decode_script': panic_output_decode_script,
397-
})
414+
kwargs[fixture].update(
415+
{
416+
'skip_check_coredump': skip_check_coredump,
417+
'panic_output_decode_script': panic_output_decode_script,
418+
}
419+
)
398420
elif 'esp' in _services and 'nuttx' in _services:
399421
from pytest_embedded_nuttx import NuttxEspDut
400422

401423
classes[fixture] = NuttxEspDut
402-
kwargs[fixture].update({
403-
'serial': None,
404-
})
424+
kwargs[fixture].update(
425+
{
426+
'serial': None,
427+
}
428+
)
405429
elif 'nuttx' in _services:
406430
from pytest_embedded_nuttx import NuttxSerialDut
407431

408432
classes[fixture] = NuttxSerialDut
409-
kwargs[fixture].update({
410-
'serial': None,
411-
})
433+
kwargs[fixture].update(
434+
{
435+
'serial': None,
436+
}
437+
)
412438
else:
413439
from pytest_embedded_serial import SerialDut
414440

415441
classes[fixture] = SerialDut
416442

417-
kwargs[fixture].update({
418-
'serial': None,
419-
})
443+
kwargs[fixture].update(
444+
{
445+
'serial': None,
446+
}
447+
)
420448

421449
return ClassCliOptions(classes, mixins, kwargs)
422450

‎pytest-embedded/pytest_embedded/log.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,14 @@ def __init__(self, msg_queue: MessageQueue, cmd: Union[str, List[str]], meta: Op
188188
self._logfile_offset = 0
189189
logging.debug(f'temp log file: {_log_file}')
190190

191-
kwargs.update({
192-
'bufsize': 0,
193-
'stdin': subprocess.PIPE,
194-
'stdout': self._fw,
195-
'stderr': self._fw,
196-
})
191+
kwargs.update(
192+
{
193+
'bufsize': 0,
194+
'stdin': subprocess.PIPE,
195+
'stdout': self._fw,
196+
'stderr': self._fw,
197+
}
198+
)
197199

198200
self._cmd = cmd
199201
logging.info('Executing %s', ' '.join(cmd) if isinstance(cmd, list) else cmd)

‎pytest-embedded/pytest_embedded/plugin.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,9 +1368,9 @@ def pytest_collection_modifyitems(self, config: Config, items: t.List[Function])
13681368
if duplicated_test_cases:
13691369
raise ValueError(f'Duplicated test function names: {duplicated_test_cases}')
13701370

1371-
duplicated_test_script_paths = self._duplicate_items([
1372-
os.path.basename(name) for name in set([str(test.path.absolute()) for test in items])
1373-
])
1371+
duplicated_test_script_paths = self._duplicate_items(
1372+
[os.path.basename(name) for name in set([str(test.path.absolute()) for test in items])]
1373+
)
13741374
if duplicated_test_script_paths:
13751375
raise ValueError(f'Duplicated test scripts: {duplicated_test_script_paths}')
13761376

0 commit comments

Comments
 (0)