mpflash 1.24.3__py3-none-any.whl → 1.24.5__py3-none-any.whl

mpflash/basicgit.py

@@ -242,7 +242,7 @@ def switch_branch(branch: str, repo: Optional[Union[Path, str]] = None) -> bool:
 
 def fetch(repo: Union[Path, str]) -> bool:
     """
-    fetches a repo and all tags
+    fetches a repo
     repo should be in the form of : path/.git
     repo = '../micropython/.git'
     returns True on success

mpflash/common.py

@@ -2,7 +2,6 @@ import fnmatch
 import glob
 import os
 import platform
-import sys
 from dataclasses import dataclass, field
 from enum import Enum
 from pathlib import Path
@@ -30,7 +29,11 @@ PORT_FWTYPES = {
 
 # Token with no permissions to avoid throttling
 # https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#getting-a-higher-rate-limit
-PAT_NO_ACCESS = "github_pat_"+"11AAHPVFQ0G4NTaQ73Bw5J"+"_fAp7K9sZ1qL8VFnI9g78eUlCdmOXHB3WzSdj2jtEYb4XF3N7PDJBl32qIxq"
+PAT_NO_ACCESS = (
+    "github_pat_"
+    + "11AAHPVFQ0G4NTaQ73Bw5J"
+    + "_fAp7K9sZ1qL8VFnI9g78eUlCdmOXHB3WzSdj2jtEYb4XF3N7PDJBl32qIxq"
+)
 
 PAT = os.environ.get("GITHUB_TOKEN") or PAT_NO_ACCESS
 GH_CLIENT = Github(auth=Auth.Token(PAT))
@@ -135,12 +138,23 @@ def filtered_comports(
     elif not isinstance(include, list):  # type: ignore
         include = list(include)
 
+    if ignore == [] and platform.system() == "Darwin":
+        # By default ignore some of the irrelevant ports on macOS
+        ignore = [
+            "/dev/*.debug-console",
+        ]
+
     # remove ports that are to be ignored
     log.trace(f"{include=}, {ignore=}, {bluetooth=}")
 
     comports = [
         p for p in list_ports.comports() if not any(fnmatch.fnmatch(p.device, i) for i in ignore)
     ]
+    
+    if False:
+        import jsons
+        print(jsons.dumps(comports).replace('{"description":', '\n{"description":'))
+
     if platform.system() == "Linux":
         # use p.location to filter out the bogus ports on newer Linux kernels
         # filter out the bogus ports on newer Linux kernels
@@ -161,16 +175,21 @@ def filtered_comports(
         else:
             # if there are ports to ignore, add the explicit list to the filtered list
             comports = list(set(explicit) | set(comports))
+    if platform.system() == "Darwin":
+        # Failsafe: filter out debug-console ports
+        comports = [p for p in comports if not p.description.endswith(".debug-console")]
+
     if not bluetooth:
         # filter out bluetooth ports
         comports = [p for p in comports if "bluetooth" not in p.description.lower()]
         comports = [p for p in comports if "BTHENUM" not in p.hwid]
-        if sys.platform == "darwin":
+        if platform.system() == "Darwin":
             comports = [p for p in comports if ".Bluetooth" not in p.device]
-        log.trace(f"no Bluetooth: {[p.device for p in comports]}")
+            # filter out ports with no hwid
+            comports = [p for p in comports if p.hwid != "n/a"]
     log.debug(f"filtered_comports: {[p.device for p in comports]}")
     # sort
-    if sys.platform == "win32":
+    if platform.system() == "Windows":
         # Windows sort of comports by number - but fallback to device name
         return sorted(
             comports,
@@ -184,7 +203,7 @@ def find_serial_by_path(target_port: str):
     """Find the symbolic link path of a serial port by its device path."""
     # sourcery skip: use-next
 
-    if os.name == "nt":
+    if platform.system() == "Windows":
         return None
     # List all available serial ports
     available_ports = list_ports.comports()

mpflash/mpboard_id/add_boards.py

@@ -25,9 +25,7 @@ RE_H_MICROPY_HW_BOARD_NAME = re.compile(r"#define\s+MICROPY_HW_BOARD_NAME\s+\"(.
 RE_H_MICROPY_HW_MCU_NAME = re.compile(r"#define\s+MICROPY_HW_MCU_NAME\s+\"(.+)\"")
 # find in the mpconfigboard.cmake files
 
-RE_CMAKE_MICROPY_HW_BOARD_NAME = re.compile(
-    r"MICROPY_HW_BOARD_NAME\s?=\s?\"(?P<variant>[\w\s\S]*)\""
-)
+RE_CMAKE_MICROPY_HW_BOARD_NAME = re.compile(r"MICROPY_HW_BOARD_NAME\s?=\s?\"(?P<variant>[\w\s\S]*)\"")
 RE_CMAKE_MICROPY_HW_MCU_NAME = re.compile(r"MICROPY_HW_MCU_NAME\s?=\s?\"(?P<variant>[\w\s\S]*)\"")
 # TODO: normal make files
 
@@ -120,9 +118,7 @@ def boards_from_headers(mpy_path: Path, version: str, family: str):
                     mcu_name = match[1]
                     found += 1
                 if found == 2:
-                    description = (
-                        f"{board_name} with {mcu_name}" if mcu_name != "-" else board_name
-                    )
+                    description = f"{board_name} with {mcu_name}" if mcu_name != "-" else board_name
                     board_list.append(
                         Board(
                             board_id=board,
@@ -164,8 +160,6 @@ def boards_for_versions(versions: List[str], mpy_path: Path):
         List[Board]: The list of Board objects.
     """
     board_list: List[Board] = []
-    # first fetch all tags from the repository
-    git.fetch(mpy_path)
     for version in track(versions, description="Searching MicroPython versions"):
         if git.checkout_tag(tag=version, repo=mpy_path):
             new_ones = boards_from_repo(mpy_path, version, family="micropython")
@@ -203,10 +197,9 @@ def make_table(board_list: List[Board]) -> rich.table.Table:
     is_wide = True
 
     table = rich.table.Table(title="MicroPython Board Information")
-    table.add_column("Port", justify="left", style="magenta")
     table.add_column("BOARD_ID", justify="left", style="green")
-    table.add_column("Variant(s)", justify="left", style="blue")
     table.add_column("Description", justify="left", style="cyan")
+    table.add_column("Port", justify="left", style="magenta")
     table.add_column("Board Name", justify="left", style="blue")
     if is_wide:
         table.add_column("MCU Name", justify="left", style="blue")
@@ -216,7 +209,7 @@ def make_table(board_list: List[Board]) -> rich.table.Table:
         table.add_column("Family", justify="left", style="blue")
 
     for board in board_list:
-        row = [board.port, board.board_id, board.variant, board.description, board.board_name]
+        row = [board.board_id, board.description, *(board.port, board.board_name)]
         if is_wide:
             row.append(board.mcu_name)
         row.extend((str(Path(board.path).suffix), board.version))
@@ -229,13 +222,7 @@ def make_table(board_list: List[Board]) -> rich.table.Table:
 
 def ask_mpy_path():
     """Ask the user for the path to the MicroPython repository."""
-    questions = [
-        inquirer.Text(
-            "mpy_path",
-            message="Enter the path to the MicroPython repository",
-            default=".\\repos\\micropython",
-        )
-    ]
+    questions = [inquirer.Text("mpy_path", message="Enter the path to the MicroPython repository", default=".\\repos\\micropython")]
     if answers := inquirer.prompt(questions):
         return Path(answers["mpy_path"])
     else:

mpflash/mpboard_id/board.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import Union
+from typing import  Union
 
 
 # - source : get_boardnames.py
@@ -20,7 +20,7 @@ class Board:
     family: str = field(default="micropython")
     mcu_name: str = field(default="")
     cpu: str = field(default="")
-    variant: str = field(default="")
+    # TODO: add variant
 
     def __post_init__(self):
         if not self.cpu:

mpflash/versions.py

@@ -1,14 +1,12 @@
 """
-#############################################################
-# Version handling copied from stubber/utils/versions.py
-#############################################################
+Version handling for mpflash and micropython-stubber
 """
 
 from pathlib import Path
 
 from cache_to_disk import NoCacheCondition, cache_to_disk
 from loguru import logger as log
-from packaging.version import parse
+from packaging.version import Version, parse
 
 import mpflash.basicgit as git
 from mpflash.common import GH_CLIENT
@@ -71,6 +69,11 @@ def clean_version(
     return version
 
 
+def is_version(version: str):
+    """Check if the version is a valid version string"""
+    return Version._regex.search(version) is not None
+
+
 @cache_to_disk(n_days_to_cache=1)
 def micropython_versions(minver: str = "v1.20", reverse: bool = False, cache_it=True):
     """Get the list of micropython versions from github tags"""
@@ -105,10 +108,9 @@ def micropython_versions(minver: str = "v1.20", reverse: bool = False, cache_it=
         cache_it = False
     versions = [v for v in versions if parse(v) >= parse(minver)]
     # remove all but the most recent (preview) version
-    versions = [v for v in versions if "preview" in v][:1] + [
-        v for v in versions if "preview" not in v
-    ]
-    versions = sorted(versions, reverse=reverse)
+    versions = versions[:1] + [v for v in versions if "preview" not in v]
+    # remove any duplicates and sort
+    versions = sorted(list(set(versions)), reverse=reverse, key=lambda s: (not is_version(s), s))
     if cache_it:
         return versions
     # returns - but does not cache

{mpflash-1.24.3.dist-info → mpflash-1.24.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 1.24.3
+Version: 1.24.5
 Summary: Flash and download tool for MicroPython firmwares
 Home-page: https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 License: MIT

{mpflash-1.24.3.dist-info → mpflash-1.24.5.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/add_firmware.py,sha256=1h0HsA-EVi3HXLmoEvzwY_a-GuWYzPwulTYHHBB8THg,3428
 mpflash/ask_input.py,sha256=RJHGGrhYniSu-bdoKnKptE3DtpiCREJGRTZmFazvG-E,8946
-mpflash/basicgit.py,sha256=ClFBBfx6jXvRfU1e0p7HI-MEUzGwBrqE0lcO5JjeWQ0,9972
+mpflash/basicgit.py,sha256=6dKexwx844R55q6X39ZDCF4HDB3t94OHyDJuuicZvjw,9959
 mpflash/bootloader/__init__.py,sha256=Qy3E6tETPnzMga9LgD5UgOvJ0zZIBEqhtEVb4v8CTWQ,107
 mpflash/bootloader/activate.py,sha256=FlO4XQlKyoOuvmDdj_0u_mjNPhjGwB_K17jQ-8nSXRA,2361
 mpflash/bootloader/detect.py,sha256=fBrILi7-ICRaregqms3PYqwiQVAJC0rXVhpyzDkoPQI,2690
@@ -13,7 +13,7 @@ mpflash/cli_flash.py,sha256=pVqEsDocDT3KmIMTpXdym-ZlzThLSIp6oVtYib65dys,7595
 mpflash/cli_group.py,sha256=VWwYHiPVV19sQEr5lL8LlcPyZ-A6Gs79eMDJy8LLt90,2615
 mpflash/cli_list.py,sha256=ja21AZ4yghGTtOHkEtV1EOmT6EYxOiU2gzJc-mZaDto,2427
 mpflash/cli_main.py,sha256=5EkvzsqOUDXvNaW814oSUcPWeNhnwh78Sg0MteDv_fk,1133
-mpflash/common.py,sha256=dyVpCUzBnL1GLbTDHND-C9w6oMmj3fl2oW_cO3zXn3Q,7376
+mpflash/common.py,sha256=uNd9dUbPQE4KT-p3Y-od8jVE51b3IcHxDWHpY5vi6Yo,7964
 mpflash/config.py,sha256=tdpvAvAlpco1GfeG2evn5tAKYluLEanqwrrvkir7QcQ,1073
 mpflash/connected.py,sha256=woYhuXoWpfzRMDUpBLVQZbVTGtMsKWNd5z1rsR1ELXA,3578
 mpflash/download.py,sha256=wE4uBSFFMAKOBH4jwHweL0wVYh4vi74t1673ku_IeoA,14305
@@ -33,10 +33,10 @@ mpflash/flash/worklist.py,sha256=owS3xJbWC-SzbK9z6jQER0Kat3OIV09IxnV-f-tjGlY,599
 mpflash/list.py,sha256=lP_S5xbC0Men9HsXcIxOsP0bFRlCYh5CynMLFJx8cEE,3607
 mpflash/logger.py,sha256=dI_H_a7EOdQJyvoeRHQuYeZuTKYVUS3DUPTLhE9rkdM,1098
 mpflash/mpboard_id/__init__.py,sha256=b9PJiKFqmfyYgfi0-pbWGp2mrljdgvO6DNy0ABS8izU,3898
-mpflash/mpboard_id/add_boards.py,sha256=sM32QWguCRuLhKO0H8KUoy4MVr_8dzJpYHUSS5KNPgw,9906
-mpflash/mpboard_id/board.py,sha256=JKb4T67HmK7widW-4c1PgilvywMbZYToLk9Fyokm-6Q,1163
+mpflash/mpboard_id/add_boards.py,sha256=47TtN98FVc6PvuOr-3-g3LacYW8JvXpM5Gr_jhdUGEU,9630
+mpflash/mpboard_id/board.py,sha256=CwtBux8y7GDUe7CADVxL8YefGRl9Fg8OAJBUhgaBYCI,1151
 mpflash/mpboard_id/board_id.py,sha256=MnDWPqp0OqCkWD3E1Mhg-g20qASgPVHdROOCdr5TpOU,3249
-mpflash/mpboard_id/board_info.zip,sha256=DC_yHwL8A8IC0YsA2ZXjlRLZkLKiw03k4FR2HSTfBXw,21328
+mpflash/mpboard_id/board_info.zip,sha256=XkIk35v6LotRMClCU-zEvo1zQiKXZAqkHfwLP4JhfaM,20102
 mpflash/mpboard_id/store.py,sha256=n85vnUAxGKv1C23wkm22ZFAFGK6AZZiCFvc1lGJJjis,1703
 mpflash/mpremoteboard/__init__.py,sha256=3F6vZHM1znUOnAo0ne-FalApM6vwbTNYg4kJwkS1gNI,9521
 mpflash/mpremoteboard/mpy_fw_info.py,sha256=eRjhqN7MpmYE9TiS4iukquZZs3QE_lD5zv_vOPSjNrk,4821
@@ -45,9 +45,9 @@ mpflash/vendor/click_aliases.py,sha256=c853EHSlkE2DvFqeFvFpwXKuJj3_jsXDP7iotVOKa
 mpflash/vendor/dfu.py,sha256=ZXMcE6aH4-43Wh4tbQT4U-q-BU3RUiL3JAxmP_QAK2s,5755
 mpflash/vendor/pydfu.py,sha256=_MdBRo1EeNeKDqFPSTB5tNL1jGSBJgsVeVjE5e7Pb8s,20542
 mpflash/vendor/readme.md,sha256=iIIZxuLUIGHQ0KODzYVtMezsztvyxCXcNJp_AzwTIPk,86
-mpflash/versions.py,sha256=PKJyBF7iK3nAQ3kE06-31QQqmvRA8JPHtCphhzIkScQ,4675
-mpflash-1.24.3.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-1.24.3.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-1.24.3.dist-info/METADATA,sha256=d11Vn2rmmYmtInvpQ2ts23ycuKoDlEqA1ryZa5waPBo,17651
-mpflash-1.24.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mpflash-1.24.3.dist-info/RECORD,,
+mpflash/versions.py,sha256=pKl-4GPHTs3_p73xywxSvsouZ3L4R2ljXSCkWj9U8HE,4742
+mpflash-1.24.5.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-1.24.5.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.24.5.dist-info/METADATA,sha256=mJfXKJ0R5EkBVnMLyRoixlpC2DmgbTj3ehYAdoTTzw4,17651
+mpflash-1.24.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mpflash-1.24.5.dist-info/RECORD,,