mpflash 1.24.2__py3-none-any.whl → 1.24.4__py3-none-any.whl

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/versions.py

@@ -72,16 +72,16 @@ def clean_version(
 
 
 @cache_to_disk(n_days_to_cache=1)
-def micropython_versions(minver: str = "v1.20", reverse: bool = False):
+def micropython_versions(minver: str = "v1.20", reverse: bool = False, cache_it=True):
     """Get the list of micropython versions from github tags"""
-    cache_it = True
+
     try:
         gh_client = GH_CLIENT
         repo = gh_client.get_repo("micropython/micropython")
         versions = [tag.name for tag in repo.get_tags() if parse(tag.name) >= parse(minver)]
         # Only keep the last preview
         versions = [v for v in versions if not v.endswith(V_PREVIEW) or v == versions[-1]]
-    except Exception:
+    except Exception as e:
         versions = [
             "v9.99.9-preview",
             "v1.22.2",

{mpflash-1.24.2.dist-info → mpflash-1.24.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 1.24.2
+Version: 1.24.4
 Summary: Flash and download tool for MicroPython firmwares
 Home-page: https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 License: MIT
@@ -51,7 +51,7 @@ Description-Content-Type: text/markdown
 This tool was initially created to be used in a CI/CD pipeline to automate the process of downloading and flashing MicroPython firmware to multiple boards, but it has been extend with a TUI to be used for manual downloadig, flashing and development.
 
 `mpflash` has been tested on:  
- - OS: Windows x64, Linux X64, but not (yet) macOS.
+ - OS: Windows x64, Linux X64, and macOS.
  - Micropython (hardware) ports: 
     - `rp2`, using `.uf2`, using filecopy 
     - `samd`, using ` .uf2`, using filecopy 
@@ -59,7 +59,7 @@ This tool was initially created to be used in a CI/CD pipeline to automate the p
     - `esp8266`, using `.bin`, using esptool
     - `stm32`, using ` .dfu`, using pydfu
 
-Not yet implemented: `nrf`, `cc3200`, `mimxrt`
+Not yet implemented: `nrf`, `cc3200`, `mimxrt`, `renesas`
  
 ## Features
  1. List the connected boards including their firmware details, in a tabular or json format

{mpflash-1.24.2.dist-info → mpflash-1.24.4.dist-info}/RECORD

@@ -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
@@ -36,7 +36,7 @@ mpflash/mpboard_id/__init__.py,sha256=b9PJiKFqmfyYgfi0-pbWGp2mrljdgvO6DNy0ABS8iz
 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=F6YowS96DAqjten4ySe4MXgZwPtE-saZOUfY5OQkqKk,19759
+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=EZtIe2RdBobhZaRIN7I-zZVNJ38CD_H8s3W8gXX9-IY,4627
-mpflash-1.24.2.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-1.24.2.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-1.24.2.dist-info/METADATA,sha256=Pqh18RSGn8Klw7DgG1JGA34WSEB3QXzJs5vZqrhzBmU,17650
-mpflash-1.24.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mpflash-1.24.2.dist-info/RECORD,,
+mpflash/versions.py,sha256=5XhbR5Ef2291zBaDTcrfDjCl8iAIiuJKVfV6oNpPofY,4628
+mpflash-1.24.4.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-1.24.4.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.24.4.dist-info/METADATA,sha256=eaCZR_hPWzmClWI-rMSs0CMKf3MT39oRlKIgaHyr8zY,17651
+mpflash-1.24.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mpflash-1.24.4.dist-info/RECORD,,