micropython-stubber 1.23.2__py3-none-any.whl → 1.23.3__py3-none-any.whl

{micropython_stubber-1.23.2.dist-info → micropython_stubber-1.23.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.23.2
+Version: 1.23.3
 Summary: Tooling to create and maintain stubs for MicroPython
 Home-page: https://github.com/Josverl/micropython-stubber#readme
 License: MIT
@@ -26,7 +26,7 @@ Requires-Dist: executing (>=2.0.1,<3.0.0)
 Requires-Dist: importlib-metadata (>=1,<9) ; python_version < "3.8"
 Requires-Dist: libcst (>=1.1.0,<2.0.0)
 Requires-Dist: loguru (>=0.6,<0.8)
-Requires-Dist: mpflash (>=1.0.2,<2.0.0)
+Requires-Dist: mpflash (>=1.0.5,<2.0.0)
 Requires-Dist: mpremote (>=1.23.0,<2.0.0)
 Requires-Dist: mypy (==1.10.1)
 Requires-Dist: mypy-gitlab-code-quality (>=1.1.0,<2.0.0)
@@ -37,7 +37,7 @@ Requires-Dist: pypi-simple (>=1.0.0,<2.0.0)
 Requires-Dist: pyright (>=1.1.341,<2.0.0)
 Requires-Dist: pyserial (>=3.5,<4.0)
 Requires-Dist: pysondb-v2 (>=2.1.0,<3.0.0)
-Requires-Dist: python-minifier (>=2.7.0,<3.0.0) ; python_version < "3.12"
+Requires-Dist: python-minifier (>=2.7.0,<3.0.0) ; python_version < "3.14"
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich-click (>=1.8.3,<2.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)

{micropython_stubber-1.23.2.dist-info → micropython_stubber-1.23.3.dist-info}/RECORD

@@ -2,7 +2,7 @@ mpflash/libusb_flash.ipynb,sha256=7RGtGg1mPPMWrfJOobOfYYwAAhsFpykpTJtfNwevY9o,66
 mpflash/mpflash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mpflash/mpflash/add_firmware.py,sha256=1h0HsA-EVi3HXLmoEvzwY_a-GuWYzPwulTYHHBB8THg,3428
 mpflash/mpflash/ask_input.py,sha256=RJHGGrhYniSu-bdoKnKptE3DtpiCREJGRTZmFazvG-E,8946
-mpflash/mpflash/basicgit.py,sha256=li6g0AsOEp2hTfGy25y-ZKvC9QFTDlv1cr6dmY_pTyY,9497
+mpflash/mpflash/basicgit.py,sha256=6dKexwx844R55q6X39ZDCF4HDB3t94OHyDJuuicZvjw,9959
 mpflash/mpflash/bootloader/__init__.py,sha256=Qy3E6tETPnzMga9LgD5UgOvJ0zZIBEqhtEVb4v8CTWQ,107
 mpflash/mpflash/bootloader/activate.py,sha256=FlO4XQlKyoOuvmDdj_0u_mjNPhjGwB_K17jQ-8nSXRA,2361
 mpflash/mpflash/bootloader/detect.py,sha256=fBrILi7-ICRaregqms3PYqwiQVAJC0rXVhpyzDkoPQI,2690
@@ -14,7 +14,7 @@ mpflash/mpflash/cli_flash.py,sha256=pVqEsDocDT3KmIMTpXdym-ZlzThLSIp6oVtYib65dys,
 mpflash/mpflash/cli_group.py,sha256=VWwYHiPVV19sQEr5lL8LlcPyZ-A6Gs79eMDJy8LLt90,2615
 mpflash/mpflash/cli_list.py,sha256=ja21AZ4yghGTtOHkEtV1EOmT6EYxOiU2gzJc-mZaDto,2427
 mpflash/mpflash/cli_main.py,sha256=5EkvzsqOUDXvNaW814oSUcPWeNhnwh78Sg0MteDv_fk,1133
-mpflash/mpflash/common.py,sha256=f7yOivJCXiIs5aywbPMrMjz4T4036njEp8wXvdyHTnI,7398
+mpflash/mpflash/common.py,sha256=dyVpCUzBnL1GLbTDHND-C9w6oMmj3fl2oW_cO3zXn3Q,7376
 mpflash/mpflash/config.py,sha256=tdpvAvAlpco1GfeG2evn5tAKYluLEanqwrrvkir7QcQ,1073
 mpflash/mpflash/connected.py,sha256=woYhuXoWpfzRMDUpBLVQZbVTGtMsKWNd5z1rsR1ELXA,3578
 mpflash/mpflash/download.py,sha256=wE4uBSFFMAKOBH4jwHweL0wVYh4vi74t1673ku_IeoA,14305
@@ -38,34 +38,34 @@ mpflash/mpflash/mpboard_id/add_boards.py,sha256=47TtN98FVc6PvuOr-3-g3LacYW8JvXpM
 mpflash/mpflash/mpboard_id/board.py,sha256=CwtBux8y7GDUe7CADVxL8YefGRl9Fg8OAJBUhgaBYCI,1151
 mpflash/mpflash/mpboard_id/board_id.py,sha256=3Qeo9cQOfn6EQ0gr5MHsl0Nk7is_piYrz0mMbV2LC-Q,2957
 mpflash/mpflash/mpboard_id/board_info.zip,sha256=F6YowS96DAqjten4ySe4MXgZwPtE-saZOUfY5OQkqKk,19759
-mpflash/mpflash/mpboard_id/store.py,sha256=4lLEff6a30lIOb4fOYYzanE4G4qfgikfprmpV1eUf2U,1536
+mpflash/mpflash/mpboard_id/store.py,sha256=n85vnUAxGKv1C23wkm22ZFAFGK6AZZiCFvc1lGJJjis,1703
 mpflash/mpflash/mpremoteboard/__init__.py,sha256=3F6vZHM1znUOnAo0ne-FalApM6vwbTNYg4kJwkS1gNI,9521
-mpflash/mpflash/mpremoteboard/mpy_fw_info.py,sha256=6AQbN3jtQgllqWQYl4e-63KeEtV08EXk8_JnM6XBkvo,4554
+mpflash/mpflash/mpremoteboard/mpy_fw_info.py,sha256=eRjhqN7MpmYE9TiS4iukquZZs3QE_lD5zv_vOPSjNrk,4821
 mpflash/mpflash/mpremoteboard/runner.py,sha256=-PgzAeBGbyXaAUlwyiw4mcINsP2U1XRRjP1_QdBrxpg,4786
 mpflash/mpflash/vendor/click_aliases.py,sha256=c853EHSlkE2DvFqeFvFpwXKuJj3_jsXDP7iotVOKaAw,3156
 mpflash/mpflash/vendor/dfu.py,sha256=ZXMcE6aH4-43Wh4tbQT4U-q-BU3RUiL3JAxmP_QAK2s,5755
 mpflash/mpflash/vendor/pydfu.py,sha256=_MdBRo1EeNeKDqFPSTB5tNL1jGSBJgsVeVjE5e7Pb8s,20542
 mpflash/mpflash/vendor/readme.md,sha256=iIIZxuLUIGHQ0KODzYVtMezsztvyxCXcNJp_AzwTIPk,86
 mpflash/mpflash/versions.py,sha256=EZtIe2RdBobhZaRIN7I-zZVNJ38CD_H8s3W8gXX9-IY,4627
-mpflash/poetry.lock,sha256=WEULyKMf6C7gfePu_TQ37XkjZ0ZnKzBYhP3dJZeimfE,120019
-mpflash/pyproject.toml,sha256=Tcmn9tm0_MEkMKaZejAq_RQEDg7z40j4dtavhlRniY0,1760
+mpflash/poetry.lock,sha256=zOLAtagNYGcgRSE2aWBoL3l1LTslG7rqfQz7oruZvFI,131499
+mpflash/pyproject.toml,sha256=k_JU0rtCWuyLhGYSwHjHyIz0SO48ErkT9jDP0QeUrzA,1760
 mpflash/README.md,sha256=YnLwTC0U1o_k_V927SZlzBLQfe-YVazl_WL-DU2_DaQ,16044
 mpflash/stm32_udev_rules.md,sha256=uxvC8FvU7K0R1QQUqCIvVfW9yfWYlIHhIVtirAjQVHE,2684
-stubber/__init__.py,sha256=HXHGDVI2boBosNEDTYa0j90C4FB7FmyMgaCvPXA7KgI,49
+stubber/__init__.py,sha256=ypu8seItScO6IJbfUEi99Fk8HGltlWLutElb_jfqPBY,49
 stubber/board/board_info.csv,sha256=K2VSmfR013fN-oJWkQUmiQ19w09dVwJHDquPy6QmMhY,8627
 stubber/board/boot.py,sha256=XjWlKErU5nI1HJSugXIP_3hlwgRQboE6sJrpcbSygnk,1120
-stubber/board/createstubs.py,sha256=Os5zki24wOpJnWgG0EkNqvcxZAI8eljZrL78HzCQxGE,33316
-stubber/board/createstubs_db.py,sha256=0_a_EnJTMR5qHOe_IU9CUohZeVoKMh8DvYtMHKSzoss,30428
-stubber/board/createstubs_db_min.py,sha256=Ptap-EvKelr-iJ5m2BoQwiBq8RloXz9zFs0wC1pR_Lg,11484
-stubber/board/createstubs_db_mpy.mpy,sha256=Kc8DcVlMZXisj2UcKIDbClPuOzn5B5smQ05hgqZSAhM,9551
+stubber/board/createstubs.py,sha256=7UsDfpOm_lIN4KSJiMrpvQItqJMX77pi5FEbPSGgLPk,32922
+stubber/board/createstubs_db.py,sha256=3wjypz4bbPAoik4gzabRJXZfVRCiM5_z4BpifpZhlLw,30383
+stubber/board/createstubs_db_min.py,sha256=lDSOaw3HjKjh0ASmHtRnXX_HzX3RBituCMl2sTBj9lE,11473
+stubber/board/createstubs_db_mpy.mpy,sha256=oHZUyh-iTIzMN_hUFyDauX8WL8ghj-YKFpTfOQRReDM,9536
 stubber/board/createstubs_lvgl.py,sha256=CTe7eq1ACRK_JJxavaqDD8znn29nSWJiHHTZ_ps6EhM,27217
 stubber/board/createstubs_lvgl_min.py,sha256=jLkWYmeboI2A8feMC7pT7cYWttLejQTuX7WAEZCylhw,27207
 stubber/board/createstubs_lvgl_mpy.mpy,sha256=ex-nlq2V5e8anQBJvRWEEc-FzU7nlwg5NSrZ8vOadIA,9267
-stubber/board/createstubs_mem.py,sha256=qAscAR-o9yYQkoZ4nluyMys0iHpds3qWI22i2OLqWDQ,28764
-stubber/board/createstubs_mem_min.py,sha256=hBloSEZ-repW4mN8RPm0DVDY3MQHbU6WsjFHlThq0qs,11029
-stubber/board/createstubs_mem_mpy.mpy,sha256=20jHgVpFEh6QTv5IvCyL7-WkwylMiVRnz9yfGXvahPI,9136
-stubber/board/createstubs_min.py,sha256=8e4yWhVdCOYO6g4eMFSCp1fN4EaKooNohjks_vLx_L8,13710
-stubber/board/createstubs_mpy.mpy,sha256=6MFxLeSeb8ES1FRBpwkTdc2d8h2t-sFdhg0GX0xMZQ4,12405
+stubber/board/createstubs_mem.py,sha256=pFNbemccszMc8NgMi0SGdbut5_mi74tzGNSBQVCMs18,28719
+stubber/board/createstubs_mem_min.py,sha256=QOcaEsq6D60sYYyJHKrQK90zuPZ3duvh1xztseP9rLE,11019
+stubber/board/createstubs_mem_mpy.mpy,sha256=QpuonHENnSzxDYQTOhxo9f8D8YV84KlzSLzjzUh9AOI,9118
+stubber/board/createstubs_min.py,sha256=XlZCYZxhW7g428CJzj8u8ZYUjFI70fW0OIWPNZjdv2U,13699
+stubber/board/createstubs_mpy.mpy,sha256=Nj0rwiGFEkCiaQcs-AiYcDp3NvPY2Hr-1xPRBBf9HwM,12388
 stubber/board/fw_info.py,sha256=6AQbN3jtQgllqWQYl4e-63KeEtV08EXk8_JnM6XBkvo,4554
 stubber/board/info.py,sha256=b7SOPZHVsVhaayKCwVkFZlYu0BW-UFI7LuG1Eop9480,5629
 stubber/board/main.py,sha256=f6V3tdt6sPZVLuwemT-NLuK9GySfW2c2J6PJMOOWQQw,413
@@ -80,7 +80,7 @@ stubber/codemod/_partials/modules_reader.py,sha256=dJj-H0ncUWVtilSyohQ-dyiUZOjQO
 stubber/codemod/add_comment.py,sha256=CZMjtKO9aarZo1E60QXo80CLJAH05z_ylK6Vvjvb0ls,1965
 stubber/codemod/add_method.py,sha256=fZH-RGi_pzFpi3tF_0AMDbA9A94dlgXMrc3ItpY3Ylw,2609
 stubber/codemod/board.py,sha256=HDNS8saQIdoPH74MNG9mte0MRBqCOcy3d6f_I0H9J2I,11881
-stubber/codemod/enrich.py,sha256=31KXntri3fRd1L0zxjsrZ7XMriZGgYGS3zHDQnskErA,5682
+stubber/codemod/enrich.py,sha256=Qh-Yb4Rkfu6XX91kFkhSnwJsmqXDxpMmsffzDmGQx4E,5436
 stubber/codemod/merge_docstub.py,sha256=rPTQGYQY-nPIhKxkEnnS77kIaZsmfW5TZ5f-mvpToj0,12679
 stubber/codemod/modify_list.py,sha256=xrpFBKug273D9E02owUheZD418BvsIHIZCFj4YDjTxU,2118
 stubber/codemod/utils.py,sha256=3hk7pwyS4KZxewrWLwbOrdA5ympbum-kfL0ZN-M7rlo,2459
@@ -121,16 +121,16 @@ stubber/publish/database.py,sha256=CLy5oiLasA-YzTTXi9d01qLAyk7NpugCDUOa5R9Ac2g,6
 stubber/publish/defaults.py,sha256=naAyHN_k8OFQfqRnXlPU3HNA0IZll-NA5GuJEvDEG_k,1532
 stubber/publish/enums.py,sha256=Z_x798ArtxyjQIRRY43GDGNB9BD4uPfpeGsXYdj31w0,780
 stubber/publish/helpers.py,sha256=909umfKUHBMBoVnAanop1vKx8loCrWntlfiiG6z89lY,716
-stubber/publish/merge_docstubs.py,sha256=XCK1DhFKhWQH-Y_6exYqZNoJmwD072FkwSRP5t0RW_Y,5511
+stubber/publish/merge_docstubs.py,sha256=M0QoJ9sUsgXH9FXPIvqX3v8mbqzHQY8uFXNdZZY0vZ8,5349
 stubber/publish/missing_class_methods.py,sha256=2ZbUsH57NkwAPk4vI8H3VVIFPz5O7kmVewybShvPbL0,1833
 stubber/publish/package.py,sha256=-6Q4cBzISAHngHXDloLzVMSC2qTCCuMH_Xa9hSYRi0E,5290
 stubber/publish/pathnames.py,sha256=vORgygaOJJAjlI3cLhNTHfowdewSDsv7zck5evPe1cY,1803
 stubber/publish/publish.py,sha256=EwniPNZc1VHsfIGtcVG_UxM6pOg0W1uaPIDOI8V1a74,3945
 stubber/publish/pypi.py,sha256=LdvwLfjkkSFBTI4MHyl7Ko_ZWn1SflWxJ9uo2mtPKtc,1272
-stubber/publish/stubpackage.py,sha256=2aAoEbMvMFZlrOeeiNeg8MfWO59tfMs0fGdBuHw5tLs,45313
+stubber/publish/stubpackage.py,sha256=jZ92mI68uergqSoOL26Ka3dqN0QD8Csx256INM6qqWY,45111
 stubber/rst/__init__.py,sha256=5VcbDCotIICa2xnJDs_gw2sFXpjjGOZZbwCrNKXy1OE,293
 stubber/rst/classsort.py,sha256=-Uji6LzBbX6voKmiXSuexJXyoQ3fmSDQ7Fuz4j1Kk8E,2655
-stubber/rst/lookup.py,sha256=6MItkUz98c7aNcZiTGiRTcB9cPx0IjC3m-9IME43cCM,20382
+stubber/rst/lookup.py,sha256=_8dhAuybPC-Pt9R6hrzR1Rxck-bAsak4lvagRsTFAAo,20281
 stubber/rst/output_dict.py,sha256=cpBXRtUD-uh0EgjWIBiRrMLBmIAEXjoJFSOAg-qJQiU,14755
 stubber/rst/reader.py,sha256=b-yAN-OjCkBZUY1FYICXckO4m81zrr5jMqX1eatITck,33609
 stubber/rst/report_return.py,sha256=p0JfJs_WTWTtRZREcQeqUgDW-_TP2VuuX7k7-c49y5E,3024
@@ -151,8 +151,8 @@ stubber/utils/repos.py,sha256=piUZwtHBXXJ-XPhvw_qXYqO-fy1ktZsb9-7CAwNo2YQ,5896
 stubber/utils/stubmaker.py,sha256=pO8Bo9JuHo6eeJGJz4hO2PzVJojNYFdJPdVtlgjKkBI,5236
 stubber/utils/typed_config_toml.py,sha256=ZR7eo-whyL4nhFXj6xs7E121sLuE-ivlUDevII4K2xg,2653
 stubber/variants.py,sha256=NnwUP-aiGUPAn15BeRRFcBWQUOzAFFnN2oL4u9zio-s,3792
-micropython_stubber-1.23.2.dist-info/entry_points.txt,sha256=JoR8NWh8t6pbDyn0WOMCIfRfDQAOGxqbOgJWuxv3Cxw,116
-micropython_stubber-1.23.2.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
-micropython_stubber-1.23.2.dist-info/METADATA,sha256=VNUucWVXkQQsJ22b98Y_Q1Me1OwDaKDUjMT0TYrwVEc,23887
-micropython_stubber-1.23.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-micropython_stubber-1.23.2.dist-info/RECORD,,
+micropython_stubber-1.23.3.dist-info/entry_points.txt,sha256=JoR8NWh8t6pbDyn0WOMCIfRfDQAOGxqbOgJWuxv3Cxw,116
+micropython_stubber-1.23.3.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
+micropython_stubber-1.23.3.dist-info/METADATA,sha256=zBAoZ9f6jJbauGM-6tXtasJV_DWRnN_9uYc8J8C21BA,23887
+micropython_stubber-1.23.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+micropython_stubber-1.23.3.dist-info/RECORD,,

mpflash/mpflash/basicgit.py

@@ -10,7 +10,7 @@ from pathlib import Path
 from typing import List, Optional, Union
 
 import cachetools.func
-from github import Auth, Github
+from github import Auth, BadCredentialsException, Github
 from loguru import logger as log
 from packaging.version import parse
 
@@ -18,7 +18,11 @@ from packaging.version import parse
 
 # 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))
 
@@ -35,9 +39,17 @@ def _run_local_git(
         if repo:
             if isinstance(repo, str):
                 repo = Path(repo)
-            result = subprocess.run(cmd, capture_output=capture_output, check=True, cwd=repo.absolute().as_posix(), encoding="utf-8")
+            result = subprocess.run(
+                cmd,
+                capture_output=capture_output,
+                check=True,
+                cwd=repo.absolute().as_posix(),
+                encoding="utf-8",
+            )
         else:
-            result = subprocess.run(cmd, capture_output=capture_output, check=True, encoding="utf-8")
+            result = subprocess.run(
+                cmd, capture_output=capture_output, check=True, encoding="utf-8"
+            )
     except (NotADirectoryError, FileNotFoundError) as e:  # pragma: no cover
         return None
     except subprocess.CalledProcessError as e:  # pragma: no cover
@@ -76,7 +88,9 @@ def clone(remote_repo: str, path: Path, shallow: bool = False, tag: Optional[str
         return False
 
 
-def get_local_tag(repo: Optional[Union[str, Path]] = None, abbreviate: bool = True) -> Union[str, None]:
+def get_local_tag(
+    repo: Optional[Union[str, Path]] = None, abbreviate: bool = True
+) -> Union[str, None]:
     """
     get the most recent git version tag of a local repo
     repo Path should be in the form of : repo = "./repo/micropython"
@@ -125,12 +139,16 @@ def get_local_tags(repo: Optional[Path] = None, minver: Optional[str] = None) ->
 @cachetools.func.ttl_cache(maxsize=16, ttl=60)  # 60 seconds
 def get_tags(repo: str, minver: Optional[str] = None) -> List[str]:
     """
-    Get list of tag of a repote github repo
+    Get list of tag of a repote github repo.
+    only the last -preview tag is kept
     """
     if not repo or not isinstance(repo, str) or "/" not in repo:  # type: ignore
         return []
     try:
         gh_repo = GH_CLIENT.get_repo(repo)
+    except BadCredentialsException as e:
+        log.error(f"Github authentication error - {e}")
+        return []
     except ConnectionError as e:
         # TODO: unable to capture the exeption
         log.warning(f"Unable to get tags - {e}")
@@ -138,7 +156,9 @@ def get_tags(repo: str, minver: Optional[str] = None) -> List[str]:
     tags = [tag.name for tag in gh_repo.get_tags()]
     if minver:
         tags = [tag for tag in tags if parse(tag) >= parse(minver)]
-    return sorted(tags)
+    # remove all but the last preview
+    tags = [t for t in sorted(tags[:-1]) if "-preview" not in t] + sorted(tags)[-1:]
+    return tags
 
 
 def checkout_tag(tag: str, repo: Optional[Union[str, Path]] = None) -> bool:

mpflash/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/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/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