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

mpflash/basicgit.py

@@ -136,6 +136,9 @@ def get_local_tags(repo: Optional[Path] = None, minver: Optional[str] = None) ->
     return sorted(tags)
 
 
+from github.GithubException import BadCredentialsException
+
+
 @cachetools.func.ttl_cache(maxsize=16, ttl=60)  # 60 seconds
 def get_tags(repo: str, minver: Optional[str] = None) -> List[str]:
     """
@@ -176,7 +179,7 @@ def checkout_tag(tag: str, repo: Optional[Union[str, Path]] = None) -> bool:
     return True
 
 
-def sync_submodules(repo: Optional[Union[Path, str]] = None) -> bool:
+def sync_submodules(repo: Union[Path, str]) -> bool:
     """
     make sure any submodules are in sync
     """
@@ -191,9 +194,26 @@ def sync_submodules(repo: Optional[Union[Path, str]] = None) -> bool:
             log.debug(result.stderr)
         else:
             return False
+    checkout_arduino_lib(Path(repo))
     return True
 
 
+def checkout_arduino_lib(mpy_path: Path):
+    """
+    Checkout the arduino-lib submodule repo if it exists
+
+    This is needed as some of the arduino boards freeze modules originationg from the arduino-lib
+    """
+    # arduino_lib_path = mpy_path / "lib/arduino-lib"
+    if (mpy_path / "lib/arduino-lib").exists():
+        cmd = ["git", "submodule", "update", "--init", "lib/arduino-lib"]
+        try:
+            result = subprocess.run(cmd, cwd=mpy_path, check=True)
+            log.info(f"checkout arduino-lib: {result.returncode}")
+        except subprocess.CalledProcessError as e:
+            log.warning("Could not check out arduino-lib, error: ", e)
+
+
 def checkout_commit(commit_hash: str, repo: Optional[Union[Path, str]] = None) -> bool:
     """
     Checkout a specific commit
@@ -242,7 +262,7 @@ def switch_branch(branch: str, repo: Optional[Union[Path, str]] = None) -> bool:
 
 def fetch(repo: Union[Path, str]) -> bool:
     """
-    fetches a repo
+    fetches a repo and all tags
     repo should be in the form of : path/.git
     repo = '../micropython/.git'
     returns True on success

mpflash/bootloader/activate.py

@@ -12,7 +12,7 @@ from .touch1200 import enter_bootloader_touch_1200bps
 
 BL_OPTIONS = {
     "stm32": [BootloaderMethod.TOUCH_1200, BootloaderMethod.MPY, BootloaderMethod.MANUAL],
-    "rp2": [BootloaderMethod.TOUCH_1200, BootloaderMethod.MPY, BootloaderMethod.MANUAL],
+    "rp2": [BootloaderMethod.MPY, BootloaderMethod.TOUCH_1200, BootloaderMethod.MANUAL],
     "samd": [BootloaderMethod.TOUCH_1200, BootloaderMethod.MPY, BootloaderMethod.MANUAL],
     "esp32": [BootloaderMethod.NONE],
     "esp8266": [BootloaderMethod.NONE],

mpflash/common.py

@@ -7,10 +7,11 @@ from enum import Enum
 from pathlib import Path
 from typing import List, Optional, Union
 
-from github import Auth, Github
 from serial.tools import list_ports
 from serial.tools.list_ports_common import ListPortInfo
 
+from mpflash.basicgit import GH_CLIENT as GH_CLIENT
+
 from .logger import log
 
 # from mpflash.mpremoteboard import MPRemoteBoard
@@ -27,17 +28,6 @@ PORT_FWTYPES = {
     "renesas-ra": [".hex"],
 }
 
-# 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 = os.environ.get("GITHUB_TOKEN") or PAT_NO_ACCESS
-GH_CLIENT = Github(auth=Auth.Token(PAT))
-
 
 @dataclass
 class FWInfo:
@@ -150,9 +140,10 @@ def filtered_comports(
     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":

mpflash/downloaded.py

@@ -14,11 +14,15 @@ from .config import config
 def downloaded_firmwares(fw_folder: Path) -> List[FWInfo]:
     """Load a list of locally downloaded firmwares from the jsonl file"""
     firmwares: List[FWInfo] = []
+    log.debug(f"Reading  {fw_folder / 'firmware.jsonl' }")
     try:
         with jsonlines.open(fw_folder / "firmware.jsonl") as reader:
             firmwares = [FWInfo.from_dict(item) for item in reader]
     except FileNotFoundError:
         log.error(f"No firmware.jsonl found in {fw_folder}")
+    except jsonlines.InvalidLineError as e:
+        log.error(f"Invalid firmware.jsonl found in {fw_folder} : {e}")
+
     # sort by filename
     firmwares.sort(key=lambda x: x.filename)
     return firmwares
@@ -109,7 +113,11 @@ def filter_downloaded_fwlist(
     log.trace(f"Filtering firmware for {version} : {len(fw_list)} found.")
     # filter by port
     if port:
-        fw_list = [fw for fw in fw_list if fw.port == port and Path(fw.firmware).suffix in PORT_FWTYPES[port]]
+        fw_list = [
+            fw
+            for fw in fw_list
+            if fw.port == port and Path(fw.firmware).suffix in PORT_FWTYPES[port]
+        ]
         log.trace(f"Filtering firmware for {port} : {len(fw_list)} found.")
 
     if board_id:
@@ -120,7 +128,7 @@ def filter_downloaded_fwlist(
             # the firmware variant should match exactly the board_id
             fw_list = [fw for fw in fw_list if fw.variant == board_id]
         log.trace(f"Filtering firmware for {board_id} : {len(fw_list)} found.")
-        
+
     if selector and port in selector:
         fw_list = [fw for fw in fw_list if fw.filename.endswith(selector[port])]
     return fw_list

mpflash/flash/esp.py

@@ -15,7 +15,7 @@ from mpflash.mpremoteboard import 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"]:
+    if mcu.port not in ["esp32", "esp8266"] or mcu.board.startswith("ARDUINO_"):
         log.error(f"esptool not supported for {mcu.port} {mcu.board} on {mcu.serialport}")
         return None
 

mpflash/flash/uf2/__init__.py

@@ -5,6 +5,7 @@ Flash SAMD and RP2 via UF2
 import shutil
 import sys
 from pathlib import Path
+import time
 from typing import Optional
 
 import tenacity
@@ -38,7 +39,21 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         log.error(f"UF2 not supported on {mcu.board} on {mcu.serialport}")
         return None
     if erase:
-        log.warning("Erase not (yet) supported on .UF2, skipping erase.")
+        if mcu.port == "rp2":
+            rp2_erase =Path(__file__).parent.joinpath("../../vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2").resolve()
+            log.info(f"Erasing {mcu.port} with {rp2_erase.name}")
+            # optimistic 
+            destination = waitfor_uf2(board_id=mcu.port.upper())
+            if not destination :
+                log.error("Board is not in bootloader mode")
+                return None
+            copy_firmware_to_uf2(rp2_erase, destination)
+            if sys.platform in ["linux"]:
+                dismount_uf2_linux()
+            # allow for MCU restart after erase
+            time.sleep(0.5)
+        else:
+            log.warning(f"Erase not (yet) supported on .UF2, for port {mcu.port}, skipping erase.")
 
     destination = waitfor_uf2(board_id=mcu.port.upper())
 
@@ -84,5 +99,6 @@ def copy_firmware_to_uf2(fw_file: Path, destination: Path):
     Copy the firmware file to the destination,
     Retry 3 times with 1s delay
     """
-    log.info(f"Copying {fw_file} to {destination}.")
+    log.trace(f"Firmware: {fw_file}")
+    log.info(f"Copying {fw_file.name} to {destination}.")
     return shutil.copy(fw_file, destination)

mpflash/mpboard_id/add_boards.py

@@ -16,16 +16,18 @@ import mpflash.basicgit as git
 from mpflash.logger import log
 from mpflash.mpboard_id import Board
 from mpflash.mpboard_id.store import write_boardinfo_json
-from mpflash.versions import micropython_versions
+from mpflash.versions import (get_preview_mp_version, get_stable_mp_version,
+                              micropython_versions)
 
 # look for all mpconfigboard.h files and extract the board name
 # from the #define MICROPY_HW_BOARD_NAME "PYBD_SF6"
 # and the #define MICROPY_HW_MCU_NAME "STM32F767xx"
 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]*)\"")
+# find boards and variants 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_MCU_NAME = re.compile(r"MICROPY_HW_MCU_NAME\s?=\s?\"(?P<variant>[\w\s\S]*)\"")
 # TODO: normal make files
 
@@ -42,20 +44,21 @@ def boards_from_repo(mpy_path: Path, version: str, family: Optional[str] = None)
     """
     if not mpy_path.exists() or not mpy_path.is_dir():
         raise FileNotFoundError(f"MicroPython path {mpy_path} does not exist.")
-    if not family:
-        family = "micropython"
-    if not version:
-        version = git.get_local_tag()  # type: ignore
+    family = family or "micropython"
+    version = version or git.get_local_tag()  # type: ignore
     if not version:
         raise ValueError("No version provided and no local tag found.")
+    elif version in ["main", "master"]:
+        version = get_preview_mp_version()
 
     board_list: List[Board] = []
     # look in mpconfigboard.h files
     board_list = boards_from_cmake(mpy_path, version, family)
 
-    # look for variants in the .cmake files
+    # look for boards in the .cmake files
     board_list.extend(boards_from_headers(mpy_path, version, family))
-    # TODO:? look for variants in the Makefile files
+
+    # TODO:? look for variants in the board.json files
 
     return board_list
 
@@ -63,7 +66,7 @@ def boards_from_repo(mpy_path: Path, version: str, family: Optional[str] = None)
 def boards_from_cmake(mpy_path: Path, version: str, family: str):
     """Get boards from the mpconfigboard.cmake files to the board_list."""
     board_list = []
-    for path in mpy_path.glob("ports/**/mpconfigboard.cmake"):
+    for path in mpy_path.glob("ports/**/mpconfigboard*.cmake"):
         board = path.parent.name
         port = path.parent.parent.parent.name
         with open(path, "r") as f:
@@ -118,7 +121,9 @@ 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,
@@ -160,6 +165,8 @@ 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")
@@ -197,9 +204,10 @@ 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")
@@ -209,7 +217,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.board_id, board.description, *(board.port, board.board_name)]
+        row = [board.port, board.board_id, board.variant, board.description, board.board_name]
         if is_wide:
             row.append(board.mcu_name)
         row.extend((str(Path(board.path).suffix), board.version))
@@ -222,7 +230,13 @@ 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="")
-    # TODO: add variant
+    variant: str = field(default="")
 
     def __post_init__(self):
         if not self.cpu:

mpflash/mpboard_id/board_id.py

@@ -9,7 +9,7 @@ from typing import Optional
 from mpflash.errors import MPFlashError
 from mpflash.logger import log
 from mpflash.mpboard_id.store import read_known_boardinfo
-from mpflash.versions import clean_version, get_stable_mp_version
+from mpflash.versions import clean_version, get_preview_mp_version, get_stable_mp_version
 
 
 def find_board_id_by_description(
@@ -64,13 +64,15 @@ def _find_board_id_by_description(
         short_descr = descr.split(" with ")[0]
     if version:
         # filter for matching version
-        if version in ("preview", "stable"):
-            # match last stable
+        if version in ("stable"):
             version = get_stable_mp_version()
+        if version in ("preview", "master"):
+            version = get_preview_mp_version()
         known_versions = sorted({b.version for b in candidate_boards})
         if version not in known_versions:
-            log.trace(f"Version {version} not found in board info, using latest known version {known_versions[-1]}")
-            version = '.'.join(known_versions[-1].split('.')[:2]) # take only major.minor
+            log.trace(known_versions)
+            log.debug(f"Version {version} not found in board info, using latest stable version {get_stable_mp_version()}")
+            version = ".".join(get_stable_mp_version().split(".")[:2])  # take only major.minor
         if version_matches := [b for b in candidate_boards if b.version.startswith(version)]:
             candidate_boards = version_matches
         else:

mpflash/mpremoteboard/__init__.py

@@ -55,7 +55,7 @@ class MPRemoteBoard:
         self.arch = ""
         self.mpy = ""
         self.build = ""
-        self.location = location # USB location
+        self.location = location  # USB location
         self.toml = {}
         if update:
             self.get_mcu_info()
@@ -97,7 +97,9 @@ class MPRemoteBoard:
 
         if sys.platform == "win32":
             # Windows sort of comports by number - but fallback to device name
-            return sorted(output, key=lambda x: int(x.split()[0][3:]) if x.split()[0][3:].isdigit() else x)
+            return sorted(
+                output, key=lambda x: int(x.split()[0][3:]) if x.split()[0][3:].isdigit() else x
+            )
         # sort by device name
         return sorted(output)
 
@@ -116,9 +118,10 @@ class MPRemoteBoard:
             ["run", str(HERE / "mpy_fw_info.py")],
             no_info=True,
             timeout=timeout,
-            resume=True,  # Avoid restarts
+            resume=False,  # Avoid restarts
         )
-        if rc != OK:
+        if rc:
+            log.debug(f"rc: {rc}, result: {result}")
             raise ConnectionError(f"Failed to get mcu_info for {self.serialport}")
         # Ok we have the info, now parse it
         raw_info = result[0].strip()
@@ -134,7 +137,9 @@ class MPRemoteBoard:
             self.description = descr = info["board"]
             pos = descr.rfind(" with")
             short_descr = descr[:pos].strip() if pos != -1 else ""
-            if board_name := find_board_id_by_description(descr, short_descr, version=self.version):
+            if board_name := find_board_id_by_description(
+                descr, short_descr, version=self.version
+            ):
                 self.board = board_name
             else:
                 self.board = "UNKNOWN_BOARD"
@@ -174,7 +179,7 @@ class MPRemoteBoard:
             except Exception as e:
                 log.error(f"Failed to parse board_info.toml: {e}")
         else:
-            log.trace(f"Failed to read board_info.toml: {result}")
+            log.trace(f"Did not find a board_info.toml: {result}")
 
     def disconnect(self) -> bool:
         """
@@ -202,7 +207,7 @@ class MPRemoteBoard:
         log_errors: bool = True,
         no_info: bool = False,
         timeout: int = 60,
-        resume: bool = False,
+        resume: Optional[bool] = None,
         **kwargs,
     ):
         """
@@ -223,7 +228,7 @@ class MPRemoteBoard:
         if self.serialport:
             prefix += ["connect", self.serialport]
         # if connected add resume to keep state between commands
-        if self.connected or resume:
+        if (resume != False) and self.connected or resume:
             prefix += ["resume"]
         cmd = prefix + cmd
         log.debug(" ".join(cmd))

mpflash/vendor/board_database.py

@@ -0,0 +1,185 @@
+"""
+The micropython git repo contains many 'board.json' files.
+
+This is an example:
+ports/stm32/boards/PYBV11/board.json
+
+{
+    "deploy": [
+        "../PYBV10/deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "PYBv1_1.jpg",
+        "PYBv1_1-C.jpg",
+        "PYBv1_1-E.jpg"
+    ],
+    "mcu": "stm32f4",
+    "product": "Pyboard v1.1",
+    "thumbnail": "",
+    "url": "https://store.micropython.org/product/PYBv1.1",
+    "variants": {
+        "DP": "Double-precision float",
+        "DP_THREAD": "Double precision float + Threads",
+        "NETWORK": "Wiznet 5200 Driver",
+        "THREAD": "Threading"
+    },
+    "vendor": "George Robotics"
+}
+
+This module implements `class Database` which reads all 'board.json' files and
+provides a way to browse it's data.
+"""
+
+from __future__ import annotations
+
+import json
+from dataclasses import dataclass, field
+from glob import glob
+from pathlib import Path
+
+
+@dataclass(order=True)
+class Variant:
+    name: str
+    """
+    Example: "DP_THREAD"
+    """
+    text: str
+    """
+    Example: "Double precision float + Threads"
+    """
+    board: Board = field(repr=False)
+
+
+@dataclass(order=True)
+class Board:
+    name: str
+    """
+    Example: "PYBV11"
+    """
+    variants: list[Variant]
+    """
+    List of variants available for this board.
+    Variants are sorted. May be an empty list if no variants are available.
+    Example key: "DP_THREAD"
+    """
+    url: str
+    """
+    Primary URL to link to this board.
+    """
+    mcu: str
+    """
+    Example: "stm32f4"
+    """
+    product: str
+    """
+    Example: "Pyboard v1.1"
+    """
+    vendor: str
+    """
+    Example: "George Robotics"
+    """
+    images: list[str]
+    """
+    Images of this board, stored in the micropython-media repository.
+    Example: ["PYBv1_1.jpg", "PYBv1_1-C.jpg", "PYBv1_1-E.jpg"]
+    """
+    deploy: list[str]
+    """
+    Files that explain how to deploy for this board:
+    Example: ["../PYBV10/deploy.md"]
+    """
+    port: Port | None = field(default=None, compare=False)
+
+    @staticmethod
+    def factory(filename_json: Path) -> Board:
+        with filename_json.open() as f:
+            board_json = json.load(f)
+
+        board = Board(
+            name=filename_json.parent.name,
+            variants=[],
+            url=board_json["url"],
+            mcu=board_json["mcu"],
+            product=board_json["product"],
+            vendor=board_json["vendor"],
+            images=board_json["images"],
+            deploy=board_json["deploy"],
+        )
+        board.variants.extend(
+            sorted([Variant(*v, board) for v in board_json.get("variants", {}).items()])  # type: ignore
+        )
+        return board
+
+
+@dataclass(order=True)
+class Port:
+    name: str
+    """
+    Example: "stm32"
+    """
+    boards: dict[str, Board] = field(default_factory=dict, repr=False)
+    """
+    Example key: "PYBV11"
+    """
+
+
+@dataclass
+class Database:
+    """
+    This database contains all information retrieved from all 'board.json' files.
+    """
+
+    mpy_root_directory: Path = field(repr=False)
+    port_filter: str = field(default="", repr=False)
+
+    ports: dict[str, Port] = field(default_factory=dict)
+    boards: dict[str, Board] = field(default_factory=dict)
+
+    def __post_init__(self) -> None:
+        mpy_dir = self.mpy_root_directory
+        # Take care to avoid using Path.glob! Performance was 15x slower.
+        for p in glob(f"{mpy_dir}/ports/**/boards/**/board.json"):
+            filename_json = Path(p)
+            port_name = filename_json.parent.parent.parent.name
+            if self.port_filter and self.port_filter != port_name:
+                continue
+
+            # Create a port
+            port = self.ports.get(port_name, None)
+            if port is None:
+                port = Port(port_name)
+                self.ports[port_name] = port
+
+            # Load board.json and attach it to the board
+            board = Board.factory(filename_json)
+            board.port = port
+
+            port.boards[board.name] = board
+            self.boards[board.name] = board
+
+        # Add 'special' ports, that don't have boards
+        # TODO(mst) Tidy up later (variant descriptions etc)
+        for special_port_name in ["unix", "webassembly", "windows"]:
+            if self.port_filter and self.port_filter != special_port_name:
+                continue
+            path = Path(mpy_dir, "ports", special_port_name)
+            variant_names = [var.name for var in path.glob("variants/*") if var.is_dir()]
+            board = Board(
+                special_port_name,
+                [],
+                f"https://github.com/micropython/micropython/blob/master/ports/{special_port_name}/README.md",
+                "",
+                "",
+                "",
+                [],
+                [],
+            )
+            board.variants = [Variant(v, "", board) for v in variant_names]
+            port = Port(special_port_name, {special_port_name: board})
+            board.port = port
+
+            self.ports[special_port_name] = port
+            self.boards[board.name] = board

mpflash/vendor/pico-universal-flash-nuke/LICENSE.txt

@@ -0,0 +1,21 @@
+Copyright 2024 Phil Howard
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+   disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

mpflash/vendor/readme.md

@@ -1,3 +1,14 @@
 These modules are vendored from the following repositories:
 
-micropython/micropython
+- https://github.com/micropython/micropython (MIT)
+  - dfu.py
+  - pydfy.py
+
+- https://github.com/mattytrentini/mpbuild (MIT)
+  - board_database.py
+
+- https://github.com/click-contrib/click-aliases  (Public Domain)
+  - click_aliases.py (Robbin Bonthond)
+
+- https://github.com/Gadgetoid/pico-universal-flash-nuke
+    - universal_flash_nuke.uf2

mpflash/versions.py

@@ -81,34 +81,16 @@ def micropython_versions(minver: str = "v1.20", reverse: bool = False, cache_it=
     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)]
+        tags = [tag.name for tag in repo.get_tags() if parse(tag.name) >= parse(minver)]
+        versions = [v for v in tags if not v.endswith(V_PREVIEW)]
         # Only keep the last preview
-        versions = [v for v in versions if not v.endswith(V_PREVIEW) or v == versions[-1]]
+        preview = sorted([v for v in tags if v.endswith(V_PREVIEW)], reverse=True)[0]
+        versions.append(preview)
     except Exception as e:
-        versions = [
-            "v9.99.9-preview",
-            "v1.22.2",
-            "v1.22.1",
-            "v1.22.0",
-            "v1.21.1",
-            "v1.21.0",
-            "v1.20.0",
-            "v1.19.1",
-            "v1.19",
-            "v1.18",
-            "v1.17",
-            "v1.16",
-            "v1.15",
-            "v1.14",
-            "v1.13",
-            "v1.12",
-            "v1.11",
-            "v1.10",
-        ]
-        cache_it = False
-    versions = [v for v in versions if parse(v) >= parse(minver)]
-    # remove all but the most recent (preview) version
-    versions = versions[:1] + [v for v in versions if "preview" not in v]
+        log.error(e)
+        versions = []
+        # returns - but does not cache
+        raise NoCacheCondition(function_value=versions)
     # remove any duplicates and sort
     versions = sorted(list(set(versions)), reverse=reverse, key=lambda s: (not is_version(s), s))
     if cache_it:
@@ -117,16 +99,18 @@ def micropython_versions(minver: str = "v1.20", reverse: bool = False, cache_it=
     raise NoCacheCondition(function_value=versions)
 
 
-def get_stable_mp_version() -> str:
+def get_stable_mp_version(cache_it=True) -> str:
     # read the versions from the git tags
-    all_versions = micropython_versions(minver=OLDEST_VERSION)
-    return [v for v in all_versions if not v.endswith(V_PREVIEW)][-1]
+    all_versions = micropython_versions(minver=OLDEST_VERSION, cache_it=cache_it)
+    versions = [v for v in all_versions if not v.endswith(V_PREVIEW)]
+    return versions[-1] if versions else ""
 
 
-def get_preview_mp_version() -> str:
+def get_preview_mp_version(cache_it=True) -> str:
     # read the versions from the git tags
-    all_versions = micropython_versions(minver=OLDEST_VERSION)
-    return [v for v in all_versions if v.endswith(V_PREVIEW)][-1]
+    all_versions = micropython_versions(minver=OLDEST_VERSION, cache_it=cache_it)
+    versions = [v for v in all_versions if v.endswith(V_PREVIEW)]
+    return versions[0] if versions else ""
 
 
 # Do not cache , same path will have different versions checked out

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

@@ -1,19 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: mpflash
-Version: 1.24.5
+Version: 1.24.7
 Summary: Flash and download tool for MicroPython firmwares
-Home-page: https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 License: MIT
 Keywords: MicroPython,firmware,flash,download,UF2,esptool
 Author: Jos Verlinde
 Author-email: jos_verlinde@hotmail.com
-Requires-Python: >=3.8.1,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: MicroPython
 Classifier: Topic :: Software Development :: Build Tools
@@ -29,14 +29,16 @@ Requires-Dist: jsons (>=1.6.3,<2.0.0)
 Requires-Dist: libusb (>=1.0.27,<2.0.0) ; sys_platform == "win32"
 Requires-Dist: loguru (>=0.7.2,<0.8.0)
 Requires-Dist: mpremote (>=1.22.0,<2.0.0)
-Requires-Dist: packaging (==23.2)
+Requires-Dist: packaging (>=24.2,<25.0)
 Requires-Dist: platformdirs (>=4.2.0,<5.0.0)
+Requires-Dist: poetry (>=2.0.1,<3.0.0)
 Requires-Dist: psutil (>=5.9.8,<6.0.0)
 Requires-Dist: pygithub (>=2.1.1,<3.0.0)
 Requires-Dist: pyusb (>=1.2.1,<2.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
 Requires-Dist: rich-click (>=1.8.1,<2.0.0)
 Requires-Dist: tenacity (==8.2.3)
+Project-URL: Homepage, https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 Project-URL: Repository, https://github.com/Josverl/micropython-stubber
 Description-Content-Type: text/markdown
 

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

@@ -1,9 +1,9 @@
 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=6dKexwx844R55q6X39ZDCF4HDB3t94OHyDJuuicZvjw,9959
+mpflash/basicgit.py,sha256=NO27JTPUsnMWQ2bKI_zsIFsFTfCZO3QKbvQ23kIehxU,10734
 mpflash/bootloader/__init__.py,sha256=Qy3E6tETPnzMga9LgD5UgOvJ0zZIBEqhtEVb4v8CTWQ,107
-mpflash/bootloader/activate.py,sha256=FlO4XQlKyoOuvmDdj_0u_mjNPhjGwB_K17jQ-8nSXRA,2361
+mpflash/bootloader/activate.py,sha256=orQOw4XTkXVZI-rMInRb0T5Wp3qA_BlzbJUA2gyBToU,2361
 mpflash/bootloader/detect.py,sha256=fBrILi7-ICRaregqms3PYqwiQVAJC0rXVhpyzDkoPQI,2690
 mpflash/bootloader/manual.py,sha256=2IfxrTFRso78FezVMTOrXMEojamFDDTXrAM9g1SbjNA,3170
 mpflash/bootloader/micropython.py,sha256=v_kZkvg0uWZDbMrT78gmiYHbD83QLdnrctvEClI8iRg,529
@@ -13,17 +13,17 @@ 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=uNd9dUbPQE4KT-p3Y-od8jVE51b3IcHxDWHpY5vi6Yo,7964
+mpflash/common.py,sha256=umTouKs5Wb7Q2zOaaoO9nqmlpHIaiDBRIGYIkZMBVO8,7558
 mpflash/config.py,sha256=tdpvAvAlpco1GfeG2evn5tAKYluLEanqwrrvkir7QcQ,1073
 mpflash/connected.py,sha256=woYhuXoWpfzRMDUpBLVQZbVTGtMsKWNd5z1rsR1ELXA,3578
 mpflash/download.py,sha256=wE4uBSFFMAKOBH4jwHweL0wVYh4vi74t1673ku_IeoA,14305
-mpflash/downloaded.py,sha256=5qrf-V1fNTTGeueXaZUAnEqa-Yqru2jLyztx0wdyeuc,4938
+mpflash/downloaded.py,sha256=nxTWU4lvhcthqvVmzpYHnXCnjD8wJv0KFq2KtaoTO1A,5160
 mpflash/errors.py,sha256=IAidY3qkZsXy6Pm1rdmVFmGyg81ywHhse3itaPctA2w,247
 mpflash/flash/__init__.py,sha256=g4Fp8MiquaDZXIvRJwYRkkll1MMyRud7x6qmwCk9Lgo,2096
-mpflash/flash/esp.py,sha256=_VfbyYIEaUgAjsD66tjbdgYL6ElkSAfpIMKz6q4QKig,2287
+mpflash/flash/esp.py,sha256=CRF8sfIyuDZoYC1luBy92zLm6Qz3dnBBWjuJ3A4_crE,2284
 mpflash/flash/stm32.py,sha256=dqp9BZ4Vr-6GlQcF12TSmRf-5TXkov9qvCpMgeUJc7Y,574
 mpflash/flash/stm32_dfu.py,sha256=W-3JsRQyf3DduoIRXDmGZ35RogqtjQgcJnk-GOtQoLE,3090
-mpflash/flash/uf2/__init__.py,sha256=ucTg1pg7TruwPjecCPWYRpCwWPz-rngv7UYaQ_bMzww,2854
+mpflash/flash/uf2/__init__.py,sha256=haL84hP2p1ZjKF6dXJJHAB_NTf7jT91MuZvmvg9SpIA,3617
 mpflash/flash/uf2/boardid.py,sha256=U5wGM8VA3wEpUxQCMtuXpMZZomdVH8J_Zd5_GekUMuU,423
 mpflash/flash/uf2/linux.py,sha256=UgoF_GhJdxA2NvfcFNV69YuDg3v4ueLM0epsDzmfKK0,4440
 mpflash/flash/uf2/macos.py,sha256=TGGijlnMJy3RDhdPS3WsPOE2lWFOQbqC3xn4cxLu8GA,1229
@@ -33,21 +33,24 @@ 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=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=XkIk35v6LotRMClCU-zEvo1zQiKXZAqkHfwLP4JhfaM,20102
+mpflash/mpboard_id/add_boards.py,sha256=xBC9DULWq6nR1Nui2Z7tiLHxC0QohPXgJOYvSgrGwEM,10063
+mpflash/mpboard_id/board.py,sha256=JKb4T67HmK7widW-4c1PgilvywMbZYToLk9Fyokm-6Q,1163
+mpflash/mpboard_id/board_id.py,sha256=A2os0LU7-i_0JuEcMc1PbLt79TiAq16qRl7fv5uzsA8,3374
+mpflash/mpboard_id/board_info.zip,sha256=0rQkVLOBRg5dwvkLmJtRdCXwKiA9arkWYVH7N8dYuNw,21720
 mpflash/mpboard_id/store.py,sha256=n85vnUAxGKv1C23wkm22ZFAFGK6AZZiCFvc1lGJJjis,1703
-mpflash/mpremoteboard/__init__.py,sha256=3F6vZHM1znUOnAo0ne-FalApM6vwbTNYg4kJwkS1gNI,9521
+mpflash/mpremoteboard/__init__.py,sha256=Vydc7jZai32lrGTUjwylZT9U8yulsgLIk39mnuI_k9I,9666
 mpflash/mpremoteboard/mpy_fw_info.py,sha256=eRjhqN7MpmYE9TiS4iukquZZs3QE_lD5zv_vOPSjNrk,4821
 mpflash/mpremoteboard/runner.py,sha256=-PgzAeBGbyXaAUlwyiw4mcINsP2U1XRRjP1_QdBrxpg,4786
+mpflash/vendor/board_database.py,sha256=QE3oXj96oTAsx94gNfHMYWu_RgBTHW1v9Wp5dq_Dt-Q,5253
 mpflash/vendor/click_aliases.py,sha256=c853EHSlkE2DvFqeFvFpwXKuJj3_jsXDP7iotVOKaAw,3156
 mpflash/vendor/dfu.py,sha256=ZXMcE6aH4-43Wh4tbQT4U-q-BU3RUiL3JAxmP_QAK2s,5755
+mpflash/vendor/pico-universal-flash-nuke/LICENSE.txt,sha256=Zkc2iTNbib2NCMwtLjMEz0vFCPglgvaw6Mj7QiWldpQ,1484
+mpflash/vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2,sha256=QuPMppqHMVOt3vDVU0bikHRLsTiDRQYNUcGQ_OLRFGI,28160
 mpflash/vendor/pydfu.py,sha256=_MdBRo1EeNeKDqFPSTB5tNL1jGSBJgsVeVjE5e7Pb8s,20542
-mpflash/vendor/readme.md,sha256=iIIZxuLUIGHQ0KODzYVtMezsztvyxCXcNJp_AzwTIPk,86
-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,,
+mpflash/vendor/readme.md,sha256=BQ7Uxf8joeYMjTUuSLLBG49ob6a9MgFPIEwuc72-Mfw,415
+mpflash/versions.py,sha256=qGkE2LTzQ1QDyHc9-wzsHsRrN7PWK69xt0Vq3EVojms,4452
+mpflash-1.24.7.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-1.24.7.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.24.7.dist-info/METADATA,sha256=kkeoaVrJt6i62yFsvXWdczncaJ3bz3055X05Ijt6z-g,17757
+mpflash-1.24.7.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+mpflash-1.24.7.dist-info/RECORD,,

{mpflash-1.24.5.dist-info → mpflash-1.24.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any