mpflash 0.9.1.post1__py3-none-any.whl → 0.9.1.post2__py3-none-any.whl

mpflash/flash/worklist.py

@@ -6,12 +6,11 @@ from typing import Dict, List, Optional, Tuple
 from loguru import logger as log
 
 from mpflash.common import FWInfo, filtered_comports
+from mpflash.downloaded import find_downloaded_firmware
 from mpflash.errors import MPFlashError
-
-from ..downloaded import find_downloaded_firmware
-from ..list import show_mcus
-from ..mpboard_id import find_known_board
-from ..mpremoteboard import MPRemoteBoard
+from mpflash.list import show_mcus
+from mpflash.mpboard_id import find_known_board
+from mpflash.mpremoteboard import MPRemoteBoard
 
 # #########################################################################################################
 WorkList = List[Tuple[MPRemoteBoard, FWInfo]]
@@ -41,9 +40,7 @@ def auto_update(
     wl: WorkList = []
     for mcu in conn_boards:
         if mcu.family not in ("micropython", "unknown"):
-            log.warning(
-                f"Skipping flashing {mcu.family} {mcu.port} {mcu.board} on {mcu.serialport} as it is not a MicroPython firmware"
-            )
+            log.warning(f"Skipping flashing {mcu.family} {mcu.port} {mcu.board} on {mcu.serialport} as it is not a MicroPython firmware")
             continue
         board_firmwares = find_downloaded_firmware(
             fw_folder=fw_folder,

mpflash/versions.py

@@ -4,10 +4,13 @@
 #############################################################
 """
 
-from cache_to_disk import cache_to_disk, NoCacheCondition
+from pathlib import Path
+
+from cache_to_disk import NoCacheCondition, cache_to_disk
 from loguru import logger as log
 from packaging.version import parse
 
+import mpflash.basicgit as git
 from mpflash.common import GH_CLIENT
 
 OLDEST_VERSION = "1.16"
@@ -27,7 +30,7 @@ def clean_version(
     commit: bool = False,
     drop_v: bool = False,
     flat: bool = False,
-):
+):  # sourcery skip: assign-if-exp
     "Clean up and transform the many flavours of versions"
     # 'v1.13.0-103-gb137d064e' --> 'v1.13-103'
     if version in {"", "-"}:
@@ -48,14 +51,12 @@ def clean_version(
     if len(nibbles) == 1:
         version = nibbles[0]
     elif build and not is_preview:
+        # HACK: this is not always right, but good enough most of the time
         version = "-".join(nibbles) if commit else "-".join(nibbles[:-1])
+    elif is_preview:
+        version = "-".join((nibbles[0], V_PREVIEW))
     else:
-        # version = "-".join((nibbles[0], LATEST))
-        # HACK: this is not always right, but good enough most of the time
-        if is_preview:
-            version = "-".join((nibbles[0], V_PREVIEW))
-        else:
-            version = V_PREVIEW
+        version = V_PREVIEW
     if flat:
         version = version.strip().replace(".", "_").replace("-", "_")
     else:
@@ -122,3 +123,13 @@ def get_preview_mp_version() -> 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]
+
+
+# Do not cache , same path will have different versions checked out
+def checkedout_version(path: Path, flat: bool = False) -> str:
+    """Get the checked-out version of the repo"""
+    version = git.get_local_tag(path.as_posix())
+    if not version:
+        raise ValueError("No valid Tag found")
+    version = clean_version(version, flat=flat, drop_v=False)
+    return version

{mpflash-0.9.1.post1.dist-info → mpflash-0.9.1.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 0.9.1.post1
+Version: 0.9.1.post2
 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-0.9.1.post1.dist-info → mpflash-0.9.1.post2.dist-info}/RECORD

@@ -29,7 +29,7 @@ mpflash/flash/uf2/linux.py,sha256=4azbcx_YqLZ3RyYNWljejHG_Y6SU-wREL8hhkTYqCjI,40
 mpflash/flash/uf2/macos.py,sha256=sncXJsc2FVfm9rvLDjcEu7ZIyrDeHmazHiNQTUaf1Y0,1187
 mpflash/flash/uf2/uf2disk.py,sha256=dQ8_U6e3qkFOyfXZDpWAsvEBIlMr-ZzLkzTDD8SADqM,286
 mpflash/flash/uf2/windows.py,sha256=k9Yv71YswPnLx-Z5rf4KjhtVkEWr8SU8EXpeRv87h3A,1290
-mpflash/flash/worklist.py,sha256=K16sbvzJCgkHNssYlBA3ezayI02RMuIcp19XAs74XeQ,5835
+mpflash/flash/worklist.py,sha256=1uBvn-T35Oey04g6xxNxo5t68q5_tp18eZcRAamF0tY,5828
 mpflash/list.py,sha256=O0tX4BvclmDMnnjMxCN9Zh8hdL6vnuvS9pLNxYLBya8,3112
 mpflash/logger.py,sha256=BAVrSXMGZLfSDRFbtVBtvb7Rl0sTJxooCgBS5t-6bXo,1057
 mpflash/mpboard_id/__init__.py,sha256=rQrPCN30GP-lfB2a2deA-lQ6iKvaKPK_xbtBoIavGsM,3716
@@ -45,9 +45,9 @@ mpflash/vendor/click_aliases.py,sha256=K98inhtze8td1dw312kexJS7OX_0ojlptPQ5Z0SHx
 mpflash/vendor/dfu.py,sha256=jGsiD3lbSV1Ar9qJubhoY_hy-L8FI-K55aow8vgwoYQ,5590
 mpflash/vendor/pydfu.py,sha256=1ObubGsPFrQ7T9M3JRlIPNIG2xx8uYffaEe0Y6bdf_g,19937
 mpflash/vendor/readme.md,sha256=ZVg7kuUYyXcWcrWkaSJ0CunwebCqu2SiS2sqDadwrT8,84
-mpflash/versions.py,sha256=SrXVZx6qVWcighHlg8pJ0RPRZ3gcYN7l2DnSicconAk,4098
-mpflash-0.9.1.post1.dist-info/LICENSE,sha256=xHwgxGNkI0R2iN4KNfbPbQSzRomWyRz7bJnR1O2mln8,1057
-mpflash-0.9.1.post1.dist-info/METADATA,sha256=ZXUp9Y65hBRqeXjcZx4O6NQL_Jg8vZnQ6ROqDl6V86U,16064
-mpflash-0.9.1.post1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-mpflash-0.9.1.post1.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-0.9.1.post1.dist-info/RECORD,,
+mpflash/versions.py,sha256=x5VrdVfWhZJfH7tZmwu2vVx-mPrK1iunYSpSce9VUXU,4492
+mpflash-0.9.1.post2.dist-info/LICENSE,sha256=xHwgxGNkI0R2iN4KNfbPbQSzRomWyRz7bJnR1O2mln8,1057
+mpflash-0.9.1.post2.dist-info/METADATA,sha256=SFrk166YQmHI5NcNGZYbOmSx9O2D1r9zvG-DxKs26EM,16064
+mpflash-0.9.1.post2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+mpflash-0.9.1.post2.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-0.9.1.post2.dist-info/RECORD,,