micropython-stubber 1.17.5__py3-none-any.whl → 1.17.6__py3-none-any.whl

{micropython_stubber-1.17.5.dist-info → micropython_stubber-1.17.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.17.5
+Version: 1.17.6
 Summary: Tooling to create and maintain stubs for MicroPython
 Home-page: https://github.com/Josverl/micropython-stubber#readme
 License: MIT

{micropython_stubber-1.17.5.dist-info → micropython_stubber-1.17.6.dist-info}/RECORD

@@ -1,37 +1,37 @@
 mpflash/mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mpflash/mpflash/cli_group.py,sha256=FuSJwE0z1lvnT1TMFs8Ejsps3UUzxyI-xdzYOa_HA3A,1226
-mpflash/mpflash/cli_main.py,sha256=fAh_gUrn2Tvo5PkFjiCNy0FX_KYlRY6y627WG0t1MGE,498
-mpflash/mpflash/common.py,sha256=bW1_JY5904cm6luUlMQmzgYXk7ukrDyMaxwovOyfHes,3875
+mpflash/mpflash/cli_group.py,sha256=oWgZlUoXY_Wc9-XMXxuxH3F0TevYNafsFWpRtT_WiiU,1228
+mpflash/mpflash/cli_main.py,sha256=nLFfR-ti_stLVvgwDRsNXgaQ43gQVZUOz_xvRERPuy0,494
+mpflash/mpflash/common.py,sha256=RBNfbojPKLK3_cxLFIvtHWy8UZUbBxN0ogBN0nliVR4,3896
 mpflash/mpflash/config.py,sha256=R_sYZ_UwzIc9H2vhwIU5RSDhpcV3fHIX83FEURWOd5E,160
-mpflash/mpflash/downloader.py,sha256=OsOTNjv-91RQc2quD8ptUzI1-pJhHekE8jARdg-1rhk,9961
+mpflash/mpflash/downloader.py,sha256=QVtgocj4b-c9ZunzEZnsyhEZu_Lbk8Hk-43qWBMJ0AI,9783
 mpflash/mpflash/flash_esp.py,sha256=XffVg1BKzaQo4pzSJdUoHmHa7h4s4gBlNQR50ahGJ1E,2301
 mpflash/mpflash/flash_stm32.py,sha256=Pn1y9rKw48D0khucT8yU3NjFkHQ9YYTvwco9ir4MmpQ,3742
 mpflash/mpflash/flash_uf2.py,sha256=8rZRqdi3Rtp8UsHxKgmoMfZ1yBXZbMFXcOeyVVMmX5w,2029
-mpflash/mpflash/flash_uf2_linux.py,sha256=NlnFN67qmUHw4GKOSay87I4H30ipOlrdHkFTF7MLwPc,3841
+mpflash/mpflash/flash_uf2_linux.py,sha256=wXtpqFan6x5k8h2bwwLqwY-LKbpyTg7n2SbD4eb6yH0,4012
 mpflash/mpflash/flash_uf2_windows.py,sha256=AiFg5jrSyEMX2QxC2sgfn8GekKBw-fPkIi8emlU7Z7o,711
-mpflash/mpflash/flasher.py,sha256=_N-CYZZZ401kxZ45CDgl1XDj3lqdMPHjhpbn82ow2Kc,9575
-mpflash/mpflash/list.py,sha256=shFNDyEnmqqDjiJ4WSpJLTkDO_6H3fvYBeJKzfGFJMw,2004
+mpflash/mpflash/flasher.py,sha256=J7-bsrfQ0MPEKrnUx47q0OqAS61roLBaETu4nv4MfMU,9400
+mpflash/mpflash/list.py,sha256=7GpZEK7fh6GCzgUdRLHGp8FMEeCbLstV-2u3ohaRYsc,1970
 mpflash/mpflash/logger.py,sha256=FvGQSR2l4O9nmJV0rKbyoeJDd7fbY2vKQTmPEED0h6s,1048
 mpflash/mpflash/uf2_boardid.py,sha256=WZKucGu_hJ8ymb236uuZbiR6pD6AA_l4LA-7LwtQhq8,414
-mpflash/poetry.lock,sha256=l12pnxUVYcoxY0wsF-fbuKdaXTERhbmVLGNG-UJsvSA,137771
-mpflash/pyproject.toml,sha256=JvsomVM_lkFtOpgz1tl6MgHVFmNaPTOU4BH31FvyFfg,1324
-mpflash/README.md,sha256=duiZ7oJb9821qJqwT9oMoOxDqaQRZLeVR2MpojLeKM4,11275
-stubber/__init__.py,sha256=8COnpfs3Cp80leTdzMMC08HsaDEJvmkcByuc_LaaHL0,49
+mpflash/poetry.lock,sha256=1Gf00ycWFfkHFFmLFDnL8ov7GhZPz0qYv-k2S91s-xo,137771
+mpflash/pyproject.toml,sha256=vffY5dhFWQLUllZl_-f5YFfSsmYwvBN8DakysierFOA,1247
+mpflash/README.md,sha256=B25tOMF5eyZ3ych_6pfTWRc6cJxwNPXbw7F2QMfJt8A,11455
+stubber/__init__.py,sha256=b_G4a0TzIG3P--Gsh1qzZaXiera0wZdKQDeZvPTSECM,49
 stubber/basicgit.py,sha256=5y7eIxmZXfGHwgGrdHtFWTB-tYdgAc7A-0b299wHMYc,9543
 stubber/board/board_info.csv,sha256=K2VSmfR013fN-oJWkQUmiQ19w09dVwJHDquPy6QmMhY,8627
 stubber/board/boot.py,sha256=XjWlKErU5nI1HJSugXIP_3hlwgRQboE6sJrpcbSygnk,1120
-stubber/board/createstubs.py,sha256=H9br-MDsuYZ1n8_ehA4GbRNzLevg0uih5r3RojZbU-w,32546
-stubber/board/createstubs_db.py,sha256=GDCA69oH5iKEutIww6v_WCsM7Qel-hG6eP1PXgkmmAI,30284
-stubber/board/createstubs_db_min.py,sha256=iTepiVcMzx4jc4dsaUPpsuS_aS2arYtNu98DInTI5eI,11424
-stubber/board/createstubs_db_mpy.mpy,sha256=5EznC9ZMMykldMvD5WqY5Ef5uI-5uhtVamGIq50dnTQ,9509
+stubber/board/createstubs.py,sha256=4yD2Ixt-E2fUS2Rq3zBrcFKYNr_avNg0pBWQP4HrWgk,32546
+stubber/board/createstubs_db.py,sha256=pbfa7tNxs0GtjaknCCDPmDqNpukw5DKqqd3UlJNiW2E,30284
+stubber/board/createstubs_db_min.py,sha256=FxhpNl8iMpH8JNXy8f6i0Ijk_e6rlGiHRv5gVK5HuYM,11424
+stubber/board/createstubs_db_mpy.mpy,sha256=tedfLsrbARO2mqJrZ-8565wMg4VMq88yB-S_f4xjt0I,9509
 stubber/board/createstubs_lvgl.py,sha256=CTe7eq1ACRK_JJxavaqDD8znn29nSWJiHHTZ_ps6EhM,27217
 stubber/board/createstubs_lvgl_min.py,sha256=jLkWYmeboI2A8feMC7pT7cYWttLejQTuX7WAEZCylhw,27207
 stubber/board/createstubs_lvgl_mpy.mpy,sha256=ex-nlq2V5e8anQBJvRWEEc-FzU7nlwg5NSrZ8vOadIA,9267
-stubber/board/createstubs_mem.py,sha256=taf12EX-546Bl-pE4K3PL0Qk_FD1tk5BrKNCl06lCGI,28618
-stubber/board/createstubs_mem_min.py,sha256=fZ9nS7z7ncSgZsEzxPYTWYP1DzE3BGkRhnnuaQ8LA0w,10970
-stubber/board/createstubs_mem_mpy.mpy,sha256=7autWFvUL0oP03qAh6okGghZAh3g8WtGjH5puJFqF-s,9091
-stubber/board/createstubs_min.py,sha256=V9mSqVH2UpZcUwg4SPeXLTrSetfIwQZqxh77HlLv3k4,13509
-stubber/board/createstubs_mpy.mpy,sha256=Ck2ZtG8PLrq214sJOKVbJr2q9I21c2aYWcwqbjNZX-Y,12193
+stubber/board/createstubs_mem.py,sha256=H8RV8p_tI8u2wsxbv4lPUQ-6e5xm0G2fL48s09rk1OY,28618
+stubber/board/createstubs_mem_min.py,sha256=aJGZFnYhz3nF7R8OZDydOBs1y1RorLDpV6UYpo3ykSg,10970
+stubber/board/createstubs_mem_mpy.mpy,sha256=SJow8erMqxCCDTkrmy5_O1S-iQy5uXyTosYGEkSpTY8,9091
+stubber/board/createstubs_min.py,sha256=9s0KTIXVwzD386ECOvVd1MW04bztv1XZd1WbsDtPErs,13509
+stubber/board/createstubs_mpy.mpy,sha256=YBDgMGamFVTq6HvTsQkAWBi7TxvC0oBEsqVL7IWbB2o,12193
 stubber/board/fw_info.py,sha256=6AQbN3jtQgllqWQYl4e-63KeEtV08EXk8_JnM6XBkvo,4554
 stubber/board/info.py,sha256=b7SOPZHVsVhaayKCwVkFZlYu0BW-UFI7LuG1Eop9480,5629
 stubber/board/main.py,sha256=f6V3tdt6sPZVLuwemT-NLuK9GySfW2c2J6PJMOOWQQw,413
@@ -40,7 +40,7 @@ stubber/board/pyrightconfig.json,sha256=6oHS4aDOfwKBAFeUPsCGJzEXpUgBZsPaF0M4P-N2
 stubber/bulk/board_id.py,sha256=R37zhRpg9kj3CqDJvPacQdbLq4d9k-Du1e7VUDWrzkI,1531
 stubber/bulk/mcu_stubber.py,sha256=NvJ8Q8nw09EfUsRg58FOGLldvb3lVIqQ1CHnpIIyeSk,16287
 stubber/bulk/mpremoteboard.py,sha256=YtaCZBCeS1ZBZrLGI7cVWuM0-0Fyc-hSpxLWofmo0qA,4843
-stubber/bulk/runner.py,sha256=r6b5V6U6LvYbrHH2L8zWwsaCqoTvgVTdU4w83CUH79Y,4070
+stubber/bulk/runner.py,sha256=AQUu8Rhj2jN5-R8F7zHi8pOCv6Z3HE0E0-KIed7QDx4,4159
 stubber/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/codemod/_partials/__init__.py,sha256=4v1lkgSBzFw08gxwujh5sivpbJbYqg5lZeRzgyvN4TE,1561
 stubber/codemod/_partials/db_main.py,sha256=APeyLDuAc-FNXRQ7ECFVqVPLfOLVyAoLuE83e2Sfg1E,4183
@@ -125,8 +125,8 @@ stubber/utils/stubmaker.py,sha256=qld_Wfm9f4EuzedXlX1Ky0i0BJdR75oOOTha13_ekz0,52
 stubber/utils/typed_config_toml.py,sha256=ikifCIZGNhS_uqsfp6IwIpxdtZqbLtywprjWG_Q0y8o,2629
 stubber/utils/versions.py,sha256=VvADhHG3ZEu5z1mm927Aj18PO1krFvxVXxxwdecRPlY,3756
 stubber/variants.py,sha256=-o4TgotbKaCcYBdXkutPaBSR1JdxWmOAiuNT1UlahYc,3784
-micropython_stubber-1.17.5.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
-micropython_stubber-1.17.5.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
-micropython_stubber-1.17.5.dist-info/METADATA,sha256=yAYj5axWwo_M19-u4Mv2reEoSFEx7vLMwpClsDu3T7I,19029
-micropython_stubber-1.17.5.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-micropython_stubber-1.17.5.dist-info/RECORD,,
+micropython_stubber-1.17.6.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
+micropython_stubber-1.17.6.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
+micropython_stubber-1.17.6.dist-info/METADATA,sha256=vXkIJk9X8j3kkA6jrJzRYWXYeGXoASOg8710O_qwL8s,19029
+micropython_stubber-1.17.6.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+micropython_stubber-1.17.6.dist-info/RECORD,,

mpflash/README.md

@@ -43,9 +43,12 @@ This will download the latest stable version of the MicroPython firmware for the
 The stable version (default) is determined based on the most recent published release,
 other optionse are `--version preview` and `--version x.y.z` to download the latest preview or version x.y.z respectively.
 
+by default the firmware will be downloaded to  Downloads  in a `firmware` folder in your, but you can specify a different directory using the `--dir` option.
+
+```bash
 The directory structure will be something like this:
 ```
-firmware
+Downloads/firmware
 |   firmware.jsonl
 +---esp8266
 |       ESP8266_GENERIC-FLASH_1M-v1.22.2.bin

mpflash/mpflash/cli_group.py

@@ -40,11 +40,11 @@ def cb_ignore(ctx, param, value):
     "--ignore",
     "-i",
     is_eager=True,
-    help="Serial port(s) to ignore. Defaults to MPTOOL_IGNORE.",
+    help="Serial port(s) to ignore. Defaults to MPFLASH_IGNORE.",
     callback=cb_ignore,
     multiple=True,
     default=[],
-    envvar="MPTOOL_IGNORE",
+    envvar="MPFLASH_IGNORE",
     show_default=True,
     metavar="SERIALPORT",
 )

mpflash/mpflash/cli_main.py

@@ -14,7 +14,7 @@ def mpflash():
     # cli.add_command(flash_board)
     # cli.add_command(list_boards)
     # cli.add_command(download)
-    cli()  # auto_envvar_prefix='MPTOOL')
+    cli(auto_envvar_prefix="MPFLASH")
 
 
 if __name__ == "__main__":

mpflash/mpflash/common.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 from typing import Dict, Union
 
+import platformdirs
 from github import Github
 from loguru import logger as log
 from packaging.version import parse
@@ -12,11 +13,11 @@ PORT_FWTYPES = {
     "rp2": ".uf2",
     "samd": ".uf2",
     "mimxrt": ".hex",
-    "nrf": ".hex",
+    "nrf": ".uf2",
     "renesas-ra": ".hex",
 }
 
-DEFAULT_FW_PATH = Path.cwd() / "firmware"
+DEFAULT_FW_PATH = platformdirs.user_downloads_path() / "firmware"
 # DEFAULT_FW_PATH = Path.home() / "mp_firmware"
 
 FWInfo = Dict[str, Union[str, bool]]
@@ -87,9 +88,7 @@ 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",

mpflash/mpflash/downloader.py

@@ -18,7 +18,7 @@ from loguru import logger as log
 from rich.progress import track
 
 from .cli_group import cli
-from .common import PORT_FWTYPES, clean_version
+from .common import DEFAULT_FW_PATH, PORT_FWTYPES, clean_version
 
 MICROPYTHON_ORG_URL = "https://micropython.org/"
 
@@ -40,6 +40,7 @@ DEFAULT_BOARDS = [
     "ARDUINO_NANO_RP2040_CONNECT",
     "PIMORONI_PICOLIPO_16MB",
     "SEEED_WIO_TERMINAL",
+    "PARTICLE_XENON",
 ]
 
 
@@ -77,9 +78,7 @@ 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]
@@ -94,9 +93,7 @@ FirmwareInfo = Dict[str, 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}"
@@ -107,9 +104,7 @@ def get_boards(
         for board in _urls:
             board["port"] = port
 
-        for board in track(
-            _urls, description="Checking download pages", transient=True
-        ):
+        for board in track(_urls, description=f"Checking {port} 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:
@@ -130,11 +125,7 @@ def get_boards(
                     # 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
 
@@ -171,9 +162,7 @@ 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)
@@ -197,21 +186,16 @@ 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)}")
@@ -233,7 +217,7 @@ def get_firmware_list(
     "--destination",
     "-d",
     type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
-    default="./firmware",
+    default=DEFAULT_FW_PATH,
     show_default=True,
     help="The folder to download the firmware to.",
 )
@@ -267,19 +251,13 @@ def get_firmware_list(
     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)

mpflash/mpflash/flash_uf2_linux.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
-from pathlib import Path
+
 import subprocess
 import sys
 import time
+from pathlib import Path
+from typing import List
+
 from loguru import logger as log
 
-from typing import List
 from .uf2_boardid import get_board_id
 
 glb_dismount_me: List[UF2Disk] = []
@@ -112,10 +114,14 @@ def wait_for_UF2_linux():
         for drive in get_uf2_drives():
             pmount(drive)
             time.sleep(1)
-            if Path(drive.mountpoint, "INFO_UF2.TXT").exists():
-                board_id = get_board_id(Path(drive.mountpoint))  # type: ignore
-                destination = Path(drive.mountpoint)
-                break
+            try:
+                if Path(drive.mountpoint, "INFO_UF2.TXT").exists():
+                    board_id = get_board_id(Path(drive.mountpoint))  # type: ignore
+                    destination = Path(drive.mountpoint)
+                    break
+            except PermissionError:
+                log.debug(f"Permission error on {drive.mountpoint}")
+                continue
         time.sleep(1)
         wait -= 1
     return destination

mpflash/mpflash/flasher.py

@@ -104,9 +104,7 @@ def auto_update(conn_boards: List[MPRemoteBoard], target_version: str, fw_folder
     wl: WorkList = []
     for mcu in conn_boards:
         if mcu.family != "micropython":
-            log.warning(
-                f"Skipping {mcu.board} on {mcu.serialport} as it is not a micropython board"
-            )
+            log.warning(f"Skipping {mcu.board} on {mcu.serialport} as it is not a micropython board")
             continue
         board_firmwares = find_firmware(
             fw_folder=fw_folder,
@@ -117,19 +115,13 @@ def auto_update(conn_boards: List[MPRemoteBoard], target_version: str, fw_folder
         )
 
         if not board_firmwares:
-            log.error(
-                f"No {target_version} firmware found for {mcu.board} on {mcu.serialport}."
-            )
+            log.error(f"No {target_version} firmware found for {mcu.board} on {mcu.serialport}.")
             continue
         if len(board_firmwares) > 1:
-            log.debug(
-                f"Multiple {target_version} firmwares found for {mcu.board} on {mcu.serialport}."
-            )
+            log.debug(f"Multiple {target_version} firmwares found for {mcu.board} on {mcu.serialport}.")
         # just use the last firmware
         fw_info = board_firmwares[-1]
-        log.info(
-            f"Found {target_version} firmware {fw_info['filename']} for {mcu.board} on {mcu.serialport}."
-        )
+        log.info(f"Found {target_version} firmware {fw_info['filename']} for {mcu.board} on {mcu.serialport}.")
         wl.append((mcu, fw_info))
     return wl
 
@@ -148,7 +140,7 @@ def auto_update(conn_boards: List[MPRemoteBoard], target_version: str, fw_folder
     "-f",
     "fw_folder",
     type=click.Path(exists=True, file_okay=False, dir_okay=True, path_type=Path),
-    default="./firmware",
+    default=DEFAULT_FW_PATH,
     show_default=True,
     help="The folder to retrieve the firmware from.",
 )
@@ -233,9 +225,7 @@ def flash_board(
         if serial_port == "auto":
             # update all connected boards
             conn_boards = [
-                MPRemoteBoard(sp)
-                for sp in MPRemoteBoard.connected_boards()
-                if sp not in config.ignore_ports
+                MPRemoteBoard(sp) for sp in MPRemoteBoard.connected_boards() if sp not in config.ignore_ports
             ]
         else:
             # just this serial port
@@ -247,9 +237,7 @@ def flash_board(
     for mcu, fw_info in todo:
         fw_file = fw_folder / fw_info["filename"]  # type: ignore
         if not fw_file.exists():
-            log.error(
-                f"File {fw_file} does not exist, skipping {mcu.board} on {mcu.serialport}"
-            )
+            log.error(f"File {fw_file} does not exist, skipping {mcu.board} on {mcu.serialport}")
             continue
         log.info(f"Updating {mcu.board} on {mcu.serialport} to {fw_info['version']}")
 
@@ -269,12 +257,13 @@ def flash_board(
 
     if flashed:
         log.info(f"Flashed {len(flashed)} boards")
-        conn_boards = [
-            MPRemoteBoard(sp)
-            for sp in MPRemoteBoard.connected_boards()
-            if sp not in config.ignore_ports
-        ]
-        show_boards(conn_boards, title="Connected boards after flashing")
+        # conn_boards = [
+        #     MPRemoteBoard(sp)
+        #     for sp in MPRemoteBoard.connected_boards()
+        #     if sp not in config.ignore_ports
+        # ]
+
+        show_boards(flashed, title="Connected boards after flashing")
 
 
 # TODO:

mpflash/mpflash/list.py

@@ -24,11 +24,7 @@ from .config import config
     help="""Output in json format""",
 )
 def list_boards(as_json: bool):
-    conn_boards = [
-        MPRemoteBoard(sp)
-        for sp in MPRemoteBoard.connected_boards()
-        if sp not in config.ignore_ports
-    ]
+    conn_boards = [MPRemoteBoard(sp) for sp in MPRemoteBoard.connected_boards() if sp not in config.ignore_ports]
 
     for mcu in track(conn_boards, description="Getting board info"):
         try:

mpflash/poetry.lock

@@ -1777,4 +1777,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.12"
-content-hash = "0e7b4bce38a6ab5223f97d0dc1a275d0458951b0572fd9154741264d32101602"
+content-hash = "f759dfee8eeeb1da187db90a1a4a53c08e0029961413ce4bfc209b8593d6f3b0"

mpflash/pyproject.toml

@@ -1,11 +1,11 @@
 [tool.poetry]
 name = "mpflash"
-version = "0.2.0"
-description = "Download and flashing tool for MicroPython firmwares"
+version = "0.2.3"
+description = "Download and flash tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
 readme = "README.md"
-keywords = ["MicroPython", "firmware", "flashing", "download"]
+keywords = ["MicroPython", "firmware", "flash", "download", "UF2", "esptool"]
 homepage = "https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md"
 repository = "https://github.com/Josverl/micropython-stubber"
 classifiers = [
@@ -27,11 +27,11 @@ jsonlines = "^4.0.0"
 bincopy = "^20.0.0"
 strip-ansi = "^0.1.1"
 rich-click = "^1.7.3"
-# micropython-stubber = {git = "https://github.com/josverl/micropython-stubber.git", rev = "action_board_stubber"}
-micropython-stubber = "1.17.4"
+micropython-stubber = ">=1.17.4"
 psutil = "^5.9.8"
 blkinfo = "^0.2.0"
 pygithub = "^2.1.1"
+platformdirs = "^4.2.0"
 
 [tool.poetry.group.dev.dependencies]
 types-beautifulsoup4 = "^4.12.0.20240106"

stubber/__init__.py

@@ -1,3 +1,3 @@
 """get the version"""
 
-__version__ = "1.17.5"
+__version__ = "1.17.6"

stubber/board/createstubs.py

@@ -24,7 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.5"
+__version__ = "v1.17.6"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]

stubber/board/createstubs_db.py

@@ -18,7 +18,7 @@ Create stubs for (all) modules on a MicroPython board.
     - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device 
 
 
-This variant was generated from createstubs.py by micropython-stubber v1.17.5
+This variant was generated from createstubs.py by micropython-stubber v1.17.6
 """
 
 # Copyright (c) 2019-2023 Jos Verlinde
@@ -43,7 +43,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.5"
+__version__ = "v1.17.6"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]

stubber/board/createstubs_db_min.py

@@ -51,7 +51,7 @@ try:from machine import reset
 except O:pass
 try:from collections import OrderedDict as k
 except O:from ucollections import OrderedDict as k
-__version__='v1.17.5'
+__version__='v1.17.6'
 A3=2
 A4=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]

stubber/board/createstubs_mem.py

@@ -9,7 +9,7 @@
     - cross compilation, using mpy-cross, 
       to avoid the compilation step on the micropython device 
 
-This variant was generated from createstubs.py by micropython-stubber v1.17.5
+This variant was generated from createstubs.py by micropython-stubber v1.17.6
 """
 
 # Copyright (c) 2019-2023 Jos Verlinde
@@ -34,7 +34,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.17.5"
+__version__ = "v1.17.6"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]

stubber/board/createstubs_mem_min.py

@@ -47,7 +47,7 @@ try:from machine import reset
 except N:pass
 try:from collections import OrderedDict as f
 except N:from ucollections import OrderedDict as f
-__version__='v1.17.5'
+__version__='v1.17.6'
 y=2
 z=2
 A0=['lib','/lib','/sd/lib','/flash/lib',J]

stubber/board/createstubs_min.py

@@ -50,7 +50,7 @@ try:from machine import reset
 except N:pass
 try:from collections import OrderedDict as g
 except N:from ucollections import OrderedDict as g
-__version__='v1.17.5'
+__version__='v1.17.6'
 A0=2
 A1=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]

stubber/bulk/runner.py

@@ -11,6 +11,7 @@ from loguru import logger as log
 
 LogTagList = List[str]
 
+
 @dataclass
 class LogTags:
     reset_tags: LogTagList
@@ -115,9 +116,10 @@ def run(
         if proc.stderr and log_errors:
             for line in proc.stderr:
                 log.warning(line)
+    except UnicodeDecodeError as e:
+        log.error(f"Failed to decode output: {e}")
     finally:
         timer.cancel()
 
     proc.wait(timeout=1)
     return proc.returncode or 0, output
-