mpflash 1.0.2__tar.gz → 1.0.4__tar.gz

{mpflash-1.0.2 → mpflash-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 1.0.2
+Version: 1.0.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

{mpflash-1.0.2 → mpflash-1.0.4}/mpflash/common.py

@@ -30,11 +30,8 @@ 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"
-    + "_11AAHPVFQ0qAkDnSUaMKSp"
-    + "_ZkDl5NRRwBsUN6EYg9ahp1Dvj4FDDONnXVgimxC2EtpY7Q7BUKBoQ0Jq72X"
-)
+PAT_NO_ACCESS = "github_pat_"+"11AAHPVFQ0G4NTaQ73Bw5J"+"_fAp7K9sZ1qL8VFnI9g78eUlCdmOXHB3WzSdj2jtEYb4XF3N7PDJBl32qIxq"
+
 PAT = os.environ.get("GITHUB_TOKEN") or PAT_NO_ACCESS
 GH_CLIENT = Github(auth=Auth.Token(PAT))
 

{mpflash-1.0.2 → mpflash-1.0.4}/mpflash/connected.py

@@ -7,15 +7,7 @@ from rich.table import Column
 from mpflash.common import filtered_comports
 from mpflash.mpremoteboard import MPRemoteBoard
 
-import os
-
-if os.name == "linux":
-    from mpflash.common import find_serial_by_path  # type: ignore
-else:
-
-    def find_serial_by_path(path: str) -> str:
-        # log.warning(f"find_serial_by_path not implemented for {os.name}")
-        return path
+from mpflash.common import find_serial_by_path
 
 
 def connected_ports_boards(
@@ -71,7 +63,7 @@ def list_mcus(
     connected_mcus = [
         MPRemoteBoard(
             c.device,
-            location=find_serial_by_path(c.device) or c.location or "?",
+            location=find_serial_by_path(c.device) or c.location or c.hwid or  "?",
         )
         for c in comports
     ]

{mpflash-1.0.2 → mpflash-1.0.4}/mpflash/mpboard_id/store.py

@@ -1,18 +1,18 @@
 import functools
 import zipfile
 from pathlib import Path
-from typing import List, Optional
+from typing import Final, List, Optional
 
 import jsons
 
 from mpflash.mpboard_id.board import Board
 
 ###############################################################################################
-HERE = Path(__file__).parent
+HERE: Final = Path(__file__).parent
 ###############################################################################################
 
 
-def write_boardinfo_json(board_list: List[Board], *, folder: Path):
+def write_boardinfo_json(board_list: List[Board], *, folder: Optional[Path] = None):
     """Writes the board information to a JSON file.
 
     Args:
@@ -21,6 +21,8 @@ def write_boardinfo_json(board_list: List[Board], *, folder: Path):
     """
     import zipfile
 
+    if not folder:
+        folder = HERE
     # create a zip file with the json file
     with zipfile.ZipFile(folder / "board_info.zip", "w", compression=zipfile.ZIP_DEFLATED) as zipf:
         # write the list to json file inside the zip
@@ -30,6 +32,9 @@ def write_boardinfo_json(board_list: List[Board], *, folder: Path):
 
 @functools.lru_cache(maxsize=20)
 def read_known_boardinfo(board_info: Optional[Path] = None) -> List[Board]:
+    """Reads the board information from a JSON file in a zip file."""
+
+    import zipfile
 
     if not board_info:
         board_info = HERE / "board_info.zip"

{mpflash-1.0.2 → mpflash-1.0.4}/mpflash/mpremoteboard/mpy_fw_info.py

@@ -36,7 +36,9 @@ def _info():  # type:() -> dict[str, str]
             "version": "",
             "build": "",
             "ver": "",
-            "port": "stm32" if sys.platform.startswith("pyb") else sys.platform,  # port: esp32 / win32 / linux / stm32
+            "port": (
+                "stm32" if sys.platform.startswith("pyb") else sys.platform
+            ),  # port: esp32 / win32 / linux / stm32
             "board": "GENERIC",
             "cpu": "",
             "mpy": "",
@@ -48,7 +50,11 @@ def _info():  # type:() -> dict[str, str]
     except AttributeError:
         pass
     try:
-        machine = sys.implementation._machine if "_machine" in dir(sys.implementation) else os.uname().machine
+        machine = (
+            sys.implementation._machine
+            if "_machine" in dir(sys.implementation)
+            else os.uname().machine
+        )
         info["board"] = machine.strip()
         info["cpu"] = machine.split("with")[-1].strip() if "with" in machine else ""
         info["mpy"] = (
@@ -100,7 +106,8 @@ def _info():  # type:() -> dict[str, str]
         if (
             info["version"]
             and info["version"].endswith(".0")
-            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.20.0 do not have a micro .0
+            and info["version"]
+            >= "1.10.0"  # versions from 1.10.0 to 1.20.0 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
             # drop the .0 for newer releases
@@ -110,19 +117,23 @@ def _info():  # type:() -> dict[str, str]
     if "mpy" in info and info["mpy"]:  # mpy on some v1.11+ builds
         sys_mpy = int(info["mpy"])
         # .mpy architecture
-        arch = [
-            None,
-            "x86",
-            "x64",
-            "armv6",
-            "armv6m",
-            "armv7m",
-            "armv7em",
-            "armv7emsp",
-            "armv7emdp",
-            "xtensa",
-            "xtensawin",
-        ][sys_mpy >> 10]
+        try:
+            arch = [
+                None,
+                "x86",
+                "x64",
+                "armv6",
+                "armv6m",
+                "armv7m",
+                "armv7em",
+                "armv7emsp",
+                "armv7emdp",
+                "xtensa",
+                "xtensawin",
+                "hazard3riscv",  # assumed
+            ][sys_mpy >> 10]
+        except IndexError:
+            arch = "unknown"
         if arch:
             info["arch"] = arch
         # .mpy version.minor

{mpflash-1.0.2 → mpflash-1.0.4}/pyproject.toml

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