mpflash 1.24.2__tar.gz → 1.24.3__tar.gz

{mpflash-1.24.2 → mpflash-1.24.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 1.24.2
+Version: 1.24.3
 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 → mpflash-1.24.3}/README.md

@@ -9,7 +9,7 @@
 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 
@@ -17,7 +17,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 → mpflash-1.24.3}/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
+    fetches a repo and all tags
     repo should be in the form of : path/.git
     repo = '../micropython/.git'
     returns True on success

{mpflash-1.24.2 → mpflash-1.24.3}/mpflash/mpboard_id/add_boards.py

@@ -25,7 +25,9 @@ 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
 
@@ -118,7 +120,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 +164,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 +203,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 +216,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 +229,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-1.24.2 → mpflash-1.24.3}/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-1.24.2 → mpflash-1.24.3}/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",
@@ -105,7 +105,9 @@ def micropython_versions(minver: str = "v1.20", reverse: bool = False):
         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]
+    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)
     if cache_it:
         return versions

{mpflash-1.24.2 → mpflash-1.24.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "1.24.2"
+version = "1.24.3"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"