mpflash 1.25.2__py3-none-any.whl → 1.26.0__py3-none-any.whl

mpflash/basicgit.py

@@ -261,7 +261,7 @@ def fetch(repo: Union[Path, str]) -> bool:
     return result.returncode == 0 if result else False
 
 
-def pull(repo: Union[Path, str], branch: str = "main") -> bool:
+def pull(repo: Union[Path, str], branch: str = "main", force: bool = True) -> bool:
     """
     pull a repo origin into main
     repo should be in the form of : path/.git
@@ -272,7 +272,9 @@ def pull(repo: Union[Path, str], branch: str = "main") -> bool:
         raise NotADirectoryError
     repo = Path(repo)
     # first checkout HEAD
-    cmd = ["git", "checkout", branch, "--quiet", "--force"]
+    cmd = ["git", "checkout", branch, "--quiet"]
+    if force:
+        cmd.append("--force")
     result = _run_local_git(cmd, repo=repo, expect_stderr=True)
     if not result:
         log.error("error during git checkout main", result)

mpflash/cli_download.py

@@ -98,7 +98,7 @@ def cli_download(**kwargs) -> int:
                         log.error(f"{e}")
     else:
         # no boards specified - detect connected ports and boards
-        params.ports, params.boards, _ , _ = connected_ports_boards_variants(include=params.serial, ignore=params.ignore)
+        params.ports, params.boards, _, _ = connected_ports_boards_variants(include=params.serial, ignore=params.ignore)
 
     params = ask_missing_params(params)
     if not params:  # Cancelled by user

mpflash/db/gather_boards.py

@@ -51,6 +51,9 @@ def boardlist_from_repo(
     if not mpy_dir.is_dir():
         log.error(f"Directory {mpy_dir} not found")
         return longlist
+    # make sure that we have all the latest and greatest from the repo
+    git.fetch(mpy_dir)
+    git.pull(mpy_dir, branch="master", force=True)
     for version in versions:
         build_nr = ""
         if "preview" in version:
@@ -99,6 +102,7 @@ def package_repo(mpy_path: Path):
     mpy_path = mpy_path or Path("../repos/micropython")
     log.info(f"Packaging Micropython boards from {mpy_path}")
     mp_versions = micropython_versions(minver="1.18")
+    # checkput
     longlist = boardlist_from_repo(
         versions=mp_versions,
         mpy_dir=mpy_path,

mpflash/mpboard_id/board_id.py

@@ -61,5 +61,4 @@ def _find_board_id_by_description(
         )
         boards = qry.all()
 
-
     return boards

{mpflash-1.25.2.dist-info → mpflash-1.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mpflash
-Version: 1.25.2
+Version: 1.26.0
 Summary: Flash and download tool for MicroPython firmwares
 License: MIT
 Keywords: MicroPython,firmware,flash,download,UF2,esptool

{mpflash-1.25.2.dist-info → mpflash-1.26.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/ask_input.py,sha256=YUx65Xwj6dNPwWcbQiWG7U4wDW69zEdno2HcT1KwPBg,8886
-mpflash/basicgit.py,sha256=J1jWsM3QuYZLjj-e9yTsj7dLkxPvT4MFz3_YaEttyXg,10190
+mpflash/basicgit.py,sha256=lpGQxL10Mq8D8S56h87aMrBH0vo18ji_hE9v0KJ9P-o,10245
 mpflash/bootloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/bootloader/activate.py,sha256=orQOw4XTkXVZI-rMInRb0T5Wp3qA_BlzbJUA2gyBToU,2361
 mpflash/bootloader/detect.py,sha256=OagP2QVWeLLWkZt2paqEF6r4_x3QDcBGNCPOWfMy9NQ,2686
@@ -8,7 +8,7 @@ mpflash/bootloader/manual.py,sha256=WYC4x-dxrSwVUfgnKTlu34pCzckrWJKZnWsARDocycI,
 mpflash/bootloader/micropython.py,sha256=v_kZkvg0uWZDbMrT78gmiYHbD83QLdnrctvEClI8iRg,529
 mpflash/bootloader/touch1200.py,sha256=VND7_YniS9Vx6WEaAxjI72RZZ6WBOwmBTsKJkbuaAHk,1105
 mpflash/cli_add.py,sha256=hI-o-9hAGD3U8cbpXvy9Nuv1KHNTZ6mS57LC4BTBtj8,3495
-mpflash/cli_download.py,sha256=EeAK5NcuJq0UeePSyHtPvBj_jEt92gh0jBmeNUcA7i0,3555
+mpflash/cli_download.py,sha256=_obDXzNp_lTcOkiMCs2ue7lfltgo-1xSQ3dP2538xWc,3554
 mpflash/cli_flash.py,sha256=SekC3goAu9_8UvMRMTEzIiiOK8js1GJRC6ymyA3BQWg,8820
 mpflash/cli_group.py,sha256=RITn2u1_77jKptapX0Vz3oUriPtGMzLVmjZOtM5SP88,2686
 mpflash/cli_list.py,sha256=dznrQrWQXvev20ai5AFvz2DFe3MNDR5RIrJmtvQou6A,2693
@@ -20,10 +20,10 @@ mpflash/custom/__init__.py,sha256=l9RU9hRm9j7IuRgacw-gHYjA2Op-5prvRO5yyODhFMQ,52
 mpflash/custom/naming.py,sha256=uHQzFIDzuWQUNajeGSUcf_A-o7cxX37kfgXhzpFHNtk,3304
 mpflash/db/__init__.py,sha256=wnIlO4nOXsPGXMbn2OCqHRsR-hUmtJsko8VdqjH3ZUE,45
 mpflash/db/core.py,sha256=6Ftp-Br3fmVO5prsvR7oc-XfF3qLJrTOy2YKosQeQQk,5271
-mpflash/db/gather_boards.py,sha256=r867g1U4xRRSGLie8cYtdotLyqy9Y7plxfqGQb-1ayw,3970
+mpflash/db/gather_boards.py,sha256=fzCT1IGZ53FwkFrTY72ZeXH5klSlm5JFETsDU7lGYf4,4134
 mpflash/db/loader.py,sha256=CDlTj2T6w9Ch9s3RHi00E1TbUhjFsgXAsYSQr5kliB0,4889
 mpflash/db/meta.py,sha256=2pFTpFH-1zejGIDp2vs0hbX5rqUONt7B1WIvf8qBx5s,2248
-mpflash/db/micropython_boards.zip,sha256=K9Y0P6JBYlgoY_mR6m_pEVtNxzO9JHaQlb_TCZACcPI,17059
+mpflash/db/micropython_boards.zip,sha256=HPYcWaY-lqkuo3Y6yksltNDG5kN4xr0Ghr511G2pALw,18349
 mpflash/db/models.py,sha256=hZrum-nS-TNFaZAksApjxYMBgGKI_kJ-4oFxc8a4WRk,3572
 mpflash/db/tools.py,sha256=6SEGfshNob4yRQ4h-Cj_xcWMRY28sbA8CWauNXV_uMI,814
 mpflash/download/__init__.py,sha256=EQez0Gj70rgrcJDbWEMYlezQyGgD747ipwmB0nt9eUI,9575
@@ -47,7 +47,7 @@ mpflash/list.py,sha256=IrJa3UBjhHHfStbb9fPVYA8JJzoFTyXtbcKGNRSH8sE,4132
 mpflash/logger.py,sha256=XLu4VzMhMPlCdOo2HeS4GfyatE1swwwonV8c6a-GoD4,2651
 mpflash/mpboard_id/__init__.py,sha256=Z6gDDWTCSKPp2fsuaUz80zgrklBR9XDlSLF9y_evR9A,391
 mpflash/mpboard_id/alternate.py,sha256=ZhqfdA9sLJmyOfJ6WwK9wrzzUn6JQdkAreiL0q5XEQg,1913
-mpflash/mpboard_id/board_id.py,sha256=xdOna_ZpTHVnsV8XQ5rrTIRCuzU69HD_ZJoY19d7dCE,1894
+mpflash/mpboard_id/board_id.py,sha256=7LE31gvzg-M4u_ivlsS0gOcEJpUKr6DffPun5oEPACA,1892
 mpflash/mpboard_id/board_info.json,sha256=A3ZIt38KvAy2NMB5srHorSBd3Q3wOZIXufWiIs3XLrs,1019745
 mpflash/mpboard_id/board_info.zip,sha256=-2bnQGRsIQuJUfz-7_-GQ8pMWJ1evhCez6yfjhXocNw,23213
 mpflash/mpboard_id/known.py,sha256=t-oREfW5P5Zue5zbte7WB9e7-mpZBF-NfHGTEUsOVLM,3521
@@ -64,8 +64,8 @@ mpflash/vendor/pico-universal-flash-nuke/universal_flash_nuke.uf2,sha256=QuPMppq
 mpflash/vendor/pydfu.py,sha256=KD1RHHuhvhWi-l1UB6GyggkxouDKtZgkG4ivRbIfwC4,21264
 mpflash/vendor/readme.md,sha256=BQ7Uxf8joeYMjTUuSLLBG49ob6a9MgFPIEwuc72-Mfw,415
 mpflash/versions.py,sha256=HuujLNdMKY_mQXyEqwXVHcU8nbuXeBiWP2TMA5JQhr4,4884
-mpflash-1.25.2.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
-mpflash-1.25.2.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
-mpflash-1.25.2.dist-info/METADATA,sha256=FkHpU3o9_3njLQFFOODMRmgFcoejObaRF9w2JoJ3mrM,27149
-mpflash-1.25.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mpflash-1.25.2.dist-info/RECORD,,
+mpflash-1.26.0.dist-info/entry_points.txt,sha256=Jk_visOhYOsZIcSP2Ms9hKqfKy1iorR-6dYltSoWCpY,52
+mpflash-1.26.0.dist-info/LICENSE,sha256=mWpNhsIxWzetYNnTpr4eb3HtgsxGIC8KcYWxXEcxQvE,1077
+mpflash-1.26.0.dist-info/METADATA,sha256=MMPqMfzQqY6gMxeXBvUahhIIq9mTvhZSpeCQSlggOsQ,27149
+mpflash-1.26.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mpflash-1.26.0.dist-info/RECORD,,