chore: formatting

Signed-off-by: Jos Verlinde <[email protected]>

Author: Josverl

src/mptool/mptool/common.py

@@ -87,7 +87,9 @@ def micropython_versions(minver: str = "v1.9.2"):
         g = Github()
         _ = 1 / 0
         repo = g.get_repo("micropython/micropython")
-        versions = [tag.name for tag in repo.get_tags() if parse(tag.name) >= parse(minver)]
+        versions = [
+            tag.name for tag in repo.get_tags() if parse(tag.name) >= parse(minver)
+        ]
     except Exception:
         versions = [
             "v9.99.9-preview",

src/mptool/mptool/downloader.py

@@ -77,7 +77,9 @@ def firmware_list(board_url: str, base_url: str, ext: str) -> List[str]:
     tags = soup.findAll(
         "a",
         recursive=True,
-        attrs={"href": re.compile(r"^/resources/firmware/.*\." + ext.lstrip(".") + "$")},
+        attrs={
+            "href": re.compile(r"^/resources/firmware/.*\." + ext.lstrip(".") + "$")
+        },
     )
     if "?" in base_url:
         base_url = base_url.split("?")[0]
@@ -92,7 +94,9 @@ def firmware_list(board_url: str, base_url: str, ext: str) -> List[str]:
 # boards we are interested in ( this avoids getting a lot of boards we don't care about)
 # The first run takes ~60 seconds to run for 4 ports , all boards
 # so it makes sense to cache the results and skip boards as soon as possible
-def get_boards(fw_types: Dict[str, str], board_list: List[str], clean: bool) -> List[FirmwareInfo]:
+def get_boards(
+    fw_types: Dict[str, str], board_list: List[str], clean: bool
+) -> List[FirmwareInfo]:
     board_urls: List[FirmwareInfo] = []
     for port in fw_types:
         download_page_url = f"{MICROPYTHON_ORG_URL}download/?port={port}"
@@ -103,7 +107,9 @@ def get_boards(fw_types: Dict[str, str], board_list: List[str], clean: bool) ->
         for board in _urls:
             board["port"] = port
 
-        for board in track(_urls, description="Checking download pages", transient=True):
+        for board in track(
+            _urls, description="Checking download pages", transient=True
+        ):
             # add a board to the list for each firmware found
             firmwares = firmware_list(board["url"], MICROPYTHON_ORG_URL, fw_types[port])
             for _url in firmwares:
@@ -124,7 +130,11 @@ def get_boards(fw_types: Dict[str, str], board_list: List[str], clean: bool) ->
                     # remove hash from firmware name
                     fname = re.sub(RE_HASH, ".", fname)
                 board["filename"] = fname
-                board["variant"] = board["filename"].split("-v")[0] if "-v" in board["filename"] else ""
+                board["variant"] = (
+                    board["filename"].split("-v")[0]
+                    if "-v" in board["filename"]
+                    else ""
+                )
                 board_urls.append(board.copy())
     return board_urls
 
@@ -161,7 +171,9 @@ def download_firmwares(
 
     firmware_folder.mkdir(exist_ok=True)
 
-    with open(firmware_folder / "firmware.jsonl", "a", encoding="utf-8", buffering=1) as f_jsonl:
+    with open(
+        firmware_folder / "firmware.jsonl", "a", encoding="utf-8", buffering=1
+    ) as f_jsonl:
         for board in unique_boards:
             filename = firmware_folder / board["port"] / board["filename"]
             filename.parent.mkdir(exist_ok=True)
@@ -185,16 +197,21 @@ def download_firmwares(
     log.info(f"Downloaded {downloaded} firmwares, skipped {skipped} existing files.")
 
 
-def get_firmware_list(board_list: List[str], version_list: List[str], preview: bool, clean: bool):
+def get_firmware_list(
+    board_list: List[str], version_list: List[str], preview: bool, clean: bool
+):
     log.trace("Checking MicroPython download pages")
 
-    board_urls = sorted(get_boards(PORT_FWTYPES, board_list, clean), key=key_fw_variant_ver)
+    board_urls = sorted(
+        get_boards(PORT_FWTYPES, board_list, clean), key=key_fw_variant_ver
+    )
 
     log.debug(f"Total {len(board_urls)} firmwares")
     relevant = [
         board
         for board in board_urls
-        if board["board"] in board_list and (board["version"] in version_list or board["preview"] and preview)
+        if board["board"] in board_list
+        and (board["version"] in version_list or board["preview"] and preview)
         # and b["port"] in ["esp32", "rp2"]
     ]
     log.debug(f"Matching firmwares: {len(relevant)}")
@@ -208,7 +225,10 @@ def get_firmware_list(board_list: List[str], version_list: List[str], preview: b
     return unique_boards
 
 
-@cli.command("download", help="Download MicroPython firmware for specific ports, boards and versions.")
+@cli.command(
+    "download",
+    help="Download MicroPython firmware for specific ports, boards and versions.",
+)
 @click.option(
     "--destination",
     "-d",
@@ -247,13 +267,19 @@ def get_firmware_list(board_list: List[str], version_list: List[str], preview: b
     help="""Force download of firmware even if it already exists.""",
     show_default=True,
 )
-def download(destination: Path, boards: List[str], versions: List[str], force: bool, clean: bool):
+def download(
+    destination: Path, boards: List[str], versions: List[str], force: bool, clean: bool
+):
     versions = list(versions)
     # preview is not a version, it is an option to include preview versions
     preview = "preview" in versions
     versions = [v for v in versions if v != "preview"]
 
     boards = list(boards) or DEFAULT_BOARDS
-    versions = [clean_version(v, drop_v=True) for v in versions]  # remove leading v from version
+    versions = [
+        clean_version(v, drop_v=True) for v in versions
+    ]  # remove leading v from version
     destination.mkdir(exist_ok=True)
-    download_firmwares(destination, boards, versions, preview=preview, force=force, clean=clean)
+    download_firmwares(
+        destination, boards, versions, preview=preview, force=force, clean=clean
+    )

src/mptool/mptool/flash_esp.py

@@ -14,9 +14,13 @@
 from stubber.bulk.mpremoteboard import MPRemoteBoard
 
 
-def flash_esp(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optional[MPRemoteBoard]:
+def flash_esp(
+    mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True
+) -> Optional[MPRemoteBoard]:
     if mcu.port not in ["esp32", "esp8266"] or mcu.board in ["ARDUINO_NANO_ESP32"]:
-        log.error(f"esptool not supported for {mcu.port} {mcu.board} on {mcu.serialport}")
+        log.error(
+            f"esptool not supported for {mcu.port} {mcu.board} on {mcu.serialport}"
+        )
         return None
 
     log.info(f"Flashing {fw_file} on {mcu.board} on {mcu.serialport}")
@@ -27,7 +31,9 @@ def flash_esp(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optio
         # baud_rate = str(115_200)
     cmds: List[List[str]] = []
     if erase:
-        cmds.append(f"esptool --chip {mcu.cpu} --port {mcu.serialport} erase_flash".split())
+        cmds.append(
+            f"esptool --chip {mcu.cpu} --port {mcu.serialport} erase_flash".split()
+        )
 
     if mcu.cpu.upper() in ("ESP32", "ESP32S2"):
         start_addr = "0x1000"

src/mptool/mptool/flash_stm32.py

@@ -33,7 +33,9 @@ def get_stm32_start_address(fw_file: Path):
         return ""
 
 
-def flash_stm32(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optional[MPRemoteBoard]:
+def flash_stm32(
+    mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True
+) -> Optional[MPRemoteBoard]:
     """
     Flash STM32 devices using STM32CubeProgrammer CLI
     - Enter bootloader mode
@@ -93,12 +95,16 @@ def flash_stm32(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Opt
             "--erase",
             "all",
         ]
-        results = subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
+        results = subprocess.run(
+            cmd, capture_output=True, text=True
+        ).stdout.splitlines()
         results = [strip_ansi(line) for line in results]
     log.info("Flashing")
     start_address = get_stm32_start_address(fw_file)
 
-    log.trace(f"STM32_Programmer_CLI --connect port=USB1 --write {str(fw_file)} --go {start_address}")
+    log.trace(
+        f"STM32_Programmer_CLI --connect port=USB1 --write {str(fw_file)} --go {start_address}"
+    )
     cmd = [
         STM32_CLI,
         "--connect",

src/mptool/mptool/flash_uf2.py

@@ -17,7 +17,9 @@
 from .flash_uf2_windows import wait_for_UF2_windows
 
 
-def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemoteBoard]:
+def flash_uf2(
+    mcu: MPRemoteBoard, fw_file: Path, erase: bool
+) -> Optional[MPRemoteBoard]:
     """
     Flash .UF2 devices via bootloader and filecopy
     - mpremote bootloader
@@ -47,7 +49,11 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         log.error(f"OS {sys.platform} not supported")
         return None
 
-    if not destination or not destination.exists() or not (destination / "INFO_UF2.TXT").exists():
+    if (
+        not destination
+        or not destination.exists()
+        or not (destination / "INFO_UF2.TXT").exists()
+    ):
         log.error("Board is not in bootloader mode")
         return None
 

src/mptool/mptool/flash_uf2_linux.py

@@ -8,17 +8,20 @@
 from typing import List
 from .uf2_boardid import get_board_id
 
-glb_dismount_me : List[UF2Disk] = []
+glb_dismount_me: List[UF2Disk] = []
+
 
 class UF2Disk:
     """Info to support mounting and unmounting of UF2 drives on linux"""
+
     device_path: str
     label: str
     mountpoint: str
 
     def __repr__(self):
         return repr(self.__dict__)
 
+
 def get_uf2_drives():
     """
     Get a list of all the (un)mounted UF2 drives
@@ -31,7 +34,7 @@ def get_uf2_drives():
 
     myblkd = BlkDiskInfo()
     filters = {
-    'tran': 'usb',
+        "tran": "usb",
     }
     usb_disks = myblkd.get_disks(filters)
     for disk in usb_disks:
@@ -44,9 +47,16 @@ def get_uf2_drives():
             uf2.device_path = "/dev/" + uf2_part["name"]
             uf2.label = uf2_part["label"]
             uf2.mountpoint = uf2_part["mountpoint"]
-            yield uf2 
-        elif disk["type"] == "disk" and disk.get("children") and len(disk.get("children")) > 0:
-            if disk.get("children")[0]["type"] == "part" and disk.get("children")[0]["fstype"] == "vfat":
+            yield uf2
+        elif (
+            disk["type"] == "disk"
+            and disk.get("children")
+            and len(disk.get("children")) > 0
+        ):
+            if (
+                disk.get("children")[0]["type"] == "part"
+                and disk.get("children")[0]["fstype"] == "vfat"
+            ):
                 uf2_part = disk.get("children")[0]
                 # print( json.dumps(uf2_part, indent=4))
                 uf2 = UF2Disk()
@@ -65,12 +75,13 @@ def pmount(disk: UF2Disk):
         if not disk.label:
             disk.label = "UF2BOOT"
         disk.mountpoint = f"/media/{disk.label}"
-        subprocess.run(["pmount",disk.device_path,  disk.mountpoint ])
+        subprocess.run(["pmount", disk.device_path, disk.mountpoint])
         log.info(f"Mounted {disk.label} at {disk.mountpoint}")
         glb_dismount_me.append(disk)
     else:
         log.warning(f"{disk.label} already mounted at {disk.mountpoint}")
 
+
 def pumount(disk: UF2Disk):
     """
     Unmount a UF2 drive
@@ -79,18 +90,20 @@ def pumount(disk: UF2Disk):
         log.error("pumount only works on Linux")
         return
     if disk.mountpoint:
-        subprocess.run(["pumount", disk.mountpoint]) # ), f"/media/{disk.label}"])
+        subprocess.run(["pumount", disk.mountpoint])  # ), f"/media/{disk.label}"])
         log.info(f"Unmounted {disk.label} from {disk.mountpoint}")
         disk.mountpoint = f""
     else:
         log.warning(f"{disk.label} already dismounted")
 
+
 def dismount_uf2():
     global glb_dismount_me
     for disk in glb_dismount_me:
         pumount(disk)
     glb_dismount_me = []
 
+
 def wait_for_UF2_linux():
     destination = ""
     wait = 10
@@ -102,9 +115,9 @@ def wait_for_UF2_linux():
             pmount(drive)
             time.sleep(1)
             if Path(drive.mountpoint, "INFO_UF2.TXT").exists():
-                board_id = get_board_id(Path(drive.mountpoint)) # type: ignore
+                board_id = get_board_id(Path(drive.mountpoint))  # type: ignore
                 destination = Path(drive.mountpoint)
                 break
         time.sleep(1)
         wait -= 1
-    return destination
+    return destination

src/mptool/mptool/flash_uf2_windows.py

@@ -5,6 +5,7 @@
 from loguru import logger as log
 from .uf2_boardid import get_board_id
 
+
 def wait_for_UF2_windows():
     destination = ""
     wait = 10
@@ -13,9 +14,9 @@ def wait_for_UF2_windows():
         drives = [drive.device for drive in psutil.disk_partitions()]
         for drive in drives:
             if Path(drive, "INFO_UF2.TXT").exists():
-                board_id = get_board_id(Path(drive)) # type: ignore
+                board_id = get_board_id(Path(drive))  # type: ignore
                 destination = Path(drive)
                 break
         time.sleep(1)
         wait -= 1
-    return destination
+    return destination

src/mptool/mptool/logger.py

@@ -30,7 +30,9 @@ def set_loglevel(loglevel: str):
         log.remove()
     except ValueError:
         pass
-    log.add(console.print, level=loglevel.upper(), colorize=False, format=_log_formatter)
+    log.add(
+        console.print, level=loglevel.upper(), colorize=False, format=_log_formatter
+    )
 
     # log.add(
     #     console.print,

src/mptool/mptool/uf2_boardid.py

@@ -1,13 +1,14 @@
 from pathlib import Path
 from loguru import logger as log
 
-def get_board_id(path:Path):
+
+def get_board_id(path: Path):
     # Option : read Board-ID from INFO_UF2.TXT
     board_id = "Unknown"
-    with open(path /  "INFO_UF2.TXT") as f:
+    with open(path / "INFO_UF2.TXT") as f:
         data = f.readlines()
     for line in data:
         if line.startswith("Board-ID"):
             board_id = line[9:].strip()
     log.trace(f"Found Board-ID={board_id}")
-    return board_id
+    return board_id

src/mptool/tests/test_sort.py

@@ -14,4 +14,4 @@
 #     fws = flasher.find_firmware(fw_folder=fw_folder, port="samd", board="SEEED_WIO_TERMINAL",preview=True)
 #     assert len(fws) > 0
 #     assert fws[0]["board"] == "SEEED_WIO_TERMINAL"
-#     assert int(fws[-1]["build"]) == 155
+#     assert int(fws[-1]["build"]) == 155