micropython-stubber 1.24.4__py3-none-any.whl → 1.25.0.post1__py3-none-any.whl

{micropython_stubber-1.24.4.dist-info → micropython_stubber-1.25.0.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: micropython-stubber
-Version: 1.24.4
+Version: 1.25.0.post1
 Summary: Tooling to create and maintain stubs for MicroPython
 License: MIT
 Keywords: MicroPython,stubs,vscode,pyright,linting,static type check
@@ -25,7 +25,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.24.7)
+Requires-Dist: mpflash (>=1.25.0)
 Requires-Dist: mpremote (>=1.24.1)
 Requires-Dist: mypy (>=1.10)
 Requires-Dist: mypy-gitlab-code-quality (>=1.1.0,<2.0.0)
@@ -40,7 +40,7 @@ Requires-Dist: pyserial (>=3.5)
 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: tenacity (>=8.2.2,<9.0.0)
+Requires-Dist: tenacity (==9.0.0)
 Requires-Dist: tomli (>=2.0.1,<3.0.0) ; python_version < "3.11"
 Requires-Dist: tomli-w (>=1.0.0,<2.0.0)
 Requires-Dist: typed-config (>=1.3.0,<2.0.0)

{micropython_stubber-1.24.4.dist-info → micropython_stubber-1.25.0.post1.dist-info}/RECORD

@@ -1,50 +1,53 @@
-stubber/__init__.py,sha256=lRYnHA4DwmdNy9mE4Lz5m-QROVtFlsF22Vk74kEGcC8,49
+stubber/__init__.py,sha256=q4tl_y-ozEZWasPZc629KNxNxqjSDsNSSTfceSkf2rY,49
 stubber/board/board_info.csv,sha256=K2VSmfR013fN-oJWkQUmiQ19w09dVwJHDquPy6QmMhY,8627
 stubber/board/boot.py,sha256=XjWlKErU5nI1HJSugXIP_3hlwgRQboE6sJrpcbSygnk,1120
-stubber/board/createstubs.py,sha256=w_n9qm7o26Be_r2vOLiRgGq87Ty5Ei7wc8hG4CiPQl0,34187
-stubber/board/createstubs_db.py,sha256=_SuvM2PvxKdDmByTkiUzP2hpu34KTqMAWDelGT9qcV0,31075
-stubber/board/createstubs_db_min.py,sha256=1VHZcuGYPhO3xysjJCGDSM3jbFn87pSZOLeVVYeaQQI,11850
-stubber/board/createstubs_db_mpy.mpy,sha256=9GQDfLlJHPepAYibiDUTK0S92YJtHDrU-r_fel86bjs,9890
+stubber/board/createstubs.py,sha256=357lczMPGvACb52bLWLu1gXx6ZVAZzITSeYDrKVsEgA,34715
+stubber/board/createstubs_db.py,sha256=b1SWgurkDOu7DG4OuyD_Pm0-EorJBLM9Dij0KQOi9zI,31621
+stubber/board/createstubs_db_min.py,sha256=WgoDwL90NYJMlnccvgsVnG9LO6CqjIUHnvTpRG0qKYc,12189
+stubber/board/createstubs_db_mpy.mpy,sha256=NN-oJsfgnZzlFEwvHYbpAKjXz-YsI5tbmaD7K8Jupz0,10148
 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=liTGFKc35mxZgUa7NT2Usk6mJmgnIbwP52hnQgrW6ig,29411
-stubber/board/createstubs_mem_min.py,sha256=4Lx-ssDzcMVit_GXLGGuSOIiDp0z08ihyqkE-mtZ9io,11396
-stubber/board/createstubs_mem_mpy.mpy,sha256=vnS3xs7NTz76AWtgQgCLGFbhM-Txx2SaetcZMpCZfX8,9469
-stubber/board/createstubs_min.py,sha256=co3dloHX2LnCuztTzmxHdwAJAgQAZqTPUM-L8dp7dl0,14138
-stubber/board/createstubs_mpy.mpy,sha256=dEWIQfFG4hMo87u7JeWbBWglC__-Kv8goYklzIK7DWI,12805
+stubber/board/createstubs_mem.py,sha256=ZR46eQ3_XqvIrpzrNavYR9Gfd5-EBcn3I6i8RvmpjYw,29939
+stubber/board/createstubs_mem_min.py,sha256=IpobaEWuzvBdKYaOrx33UtZn59HfiyVTkRobc-XLpvg,11719
+stubber/board/createstubs_mem_mpy.mpy,sha256=NhivvWh-0uGyry2QmbpWsppRx3-rCamhNR3s0SItgLQ,9735
+stubber/board/createstubs_min.py,sha256=0cbZJeNjQBbHXcF462JsfQqTG718BaLa46Cln-a32Qc,14463
+stubber/board/createstubs_mpy.mpy,sha256=xonRZtK_23kymK5Q7Gzpjh6nBgy5HPVWs9ol2x2XLn8,13071
 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
 stubber/board/modulelist.txt,sha256=rZ6sn8CXjVYRKCcM0rlurfiIwsDuWhzSPOleAmoxCCI,2945
+stubber/board/pkg_full.json,sha256=XvlpWpX8x1NxNQLDipkJWm66gz9YpDY4hJYtl-hMK9s,544
+stubber/board/pkg_minified.json,sha256=JlrQdWXzgomiOXJP6iTSzSK-8NgojLIzqiXjFFreM18,430
+stubber/board/pkg_mpy.json,sha256=gsBLJBRHhfWvYsb0Ux2am539v8nXIKikZ98ezYFRu5I,436
 stubber/board/pyrightconfig.json,sha256=6oHS4aDOfwKBAFeUPsCGJzEXpUgBZsPaF0M4P-N26D4,1376
-stubber/bulk/mcu_stubber.py,sha256=_DLUf0SlYZRIAPRsHInIbQYwTmWF9U9-nFfWQ9D3k3w,15731
+stubber/bulk/mcu_stubber.py,sha256=kVhVESmi5FcWAdk1OCsMyZRGaraGELMYO1WuMsfFbuY,14524
 stubber/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/codemod/_partials/__init__.py,sha256=LVJ-QkEKlc5IqOZ-bYrNXWRd9J5eolsTR_kRTyS9p6w,1430
-stubber/codemod/_partials/db_main.py,sha256=ZKzxV0LOEyHu1zcsBr4xRf9i1a4Jyh808sdbmcmkrWE,4003
+stubber/codemod/_partials/db_main.py,sha256=w4RF6s1T75EwN6-RFmdBP0uhWD-e1W1EZDBbmyoZex0,4021
 stubber/codemod/_partials/lvgl_main.py,sha256=9BAJP6P1R2SQVbNya2ujes35eATa56D_Ri2_PjeRBq0,1964
 stubber/codemod/_partials/modules_reader.py,sha256=dJj-H0ncUWVtilSyohQ-dyiUZOjQObds_-llwy_LkYU,2046
 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=dP24t9RO_klQZS7Yqiwt7Rh85B76s6GC2r4B7tVzEn0,11882
 stubber/codemod/enrich.py,sha256=YB-tXo_UjeVboG2uPAG8d1g81STdhWL4NvCfZ6YPduk,12928
-stubber/codemod/merge_docstub.py,sha256=4G5MwF1FhgJ2UR__vDtKo96uSNwvdy1q3OkYl78yuic,23352
+stubber/codemod/merge_docstub.py,sha256=XTvsw4BetCRU1-dJlQisVdDx03ldBh7Yc7aREmLiJPs,27956
 stubber/codemod/modify_list.py,sha256=xrpFBKug273D9E02owUheZD418BvsIHIZCFj4YDjTxU,2118
 stubber/codemod/utils.py,sha256=3hk7pwyS4KZxewrWLwbOrdA5ympbum-kfL0ZN-M7rlo,2459
 stubber/codemod/visitors/type_helpers.py,sha256=UdYKsKDTqzHmPNBuWK1lY0sboXrm7RIY0B4FHLtWo3s,10572
 stubber/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/commands/build_cmd.py,sha256=Zseci4EHxJuiiy7YS-ucmMokDrVLe4j6fPs-PSbwq1k,2813
 stubber/commands/cli.py,sha256=HY4CqB0PPTmzew2sABNsHeNKDPblcGzzbmvtF46oVsU,1556
-stubber/commands/clone_cmd.py,sha256=QyKnU3calhVx-rhlfzbeZbqgBFFTzfoYeKHNH9qmfgM,2781
+stubber/commands/clone_cmd.py,sha256=WZnQIqsnkdddXz32riLUw9zhNXHAgk_LODnwbtQlpbo,2714
 stubber/commands/config_cmd.py,sha256=e8heX27MXfazLxMVtgjK4dsLCWhsoCfdeYGVoH3rqtA,1211
 stubber/commands/enrich_folder_cmd.py,sha256=LDdSAfDlsAQAddYT9Rp3bFiF6maqA457AmMyWNXdXtg,2236
-stubber/commands/get_core_cmd.py,sha256=Ua_10gdwOX9ceHY4SLV36esdTWbCwGtQ593A-qR_pgg,2323
-stubber/commands/get_docstubs_cmd.py,sha256=OQAZn29pDmUDLbpOOyja0IGIxRCKAskY7UGcX90hAkQ,5179
-stubber/commands/get_frozen_cmd.py,sha256=KgcOj-YjxChQcxCvEa-Rqq6_RW8RQteefAdYjoKEAZE,4251
+stubber/commands/get_core_cmd.py,sha256=PSjBJz4F8FlT3c_4E-XFo6Xw0dRQzQl0TxsxCoLwIPY,2324
+stubber/commands/get_docstubs_cmd.py,sha256=04h41BCQxXtvm193jJTj0VEaxJWgvk7SZFJMU4DTt7M,5180
+stubber/commands/get_frozen_cmd.py,sha256=gutYwHdz7XO8CLxutEFiQOUGgKInrKViEKvV8I5eVJU,4253
 stubber/commands/get_mcu_cmd.py,sha256=CTQVIoGqBx6gwUp1aH1gOysVFEZbeqMvpPb2WJA4EVQ,2807
 stubber/commands/merge_cmd.py,sha256=0tKgvBiYjleXac0z5vDMxzvAgiZQUF0DafPqoIueKS8,1641
 stubber/commands/publish_cmd.py,sha256=eo052T3k0YW6m0gJJ3hoZbchd0whMr74z3MudHKthIQ,3275
-stubber/commands/stub_cmd.py,sha256=eqhZJ2cyt1-jPxSaywUP8Sn4hPbdCnMQp5TSnZji6gk,1216
+stubber/commands/stub_cmd.py,sha256=BJZwpjTQjNEtrBjtUZmvmVb96LuSmg0rwQfgQ3ghHrg,1217
 stubber/commands/switch_cmd.py,sha256=yeK9rNkIl8WicheUGHnK5u7YrV5iR1KBEILVUfbOQtA,1866
 stubber/commands/variants_cmd.py,sha256=Q7DjPElEfSHhDxAlvtiGHWv9e47QPSLYMIs0ScfI7AA,1296
 stubber/data/board_info.csv,sha256=K2VSmfR013fN-oJWkQUmiQ19w09dVwJHDquPy6QmMhY,8627
@@ -84,24 +87,24 @@ stubber/rst/reader.py,sha256=sNZwEpSG8esBrPvD-gVjtku828XfLNst-earA3XBN1c,35426
 stubber/rst/report_return.py,sha256=p0JfJs_WTWTtRZREcQeqUgDW-_TP2VuuX7k7-c49y5E,3024
 stubber/rst/rst_utils.py,sha256=-F6J09-WQBzI5419ItzOlm4gUKxF4BMru2OyXx-M6ko,18314
 stubber/stubber.py,sha256=GxLfHIzDyfFvgiTqMj9DB3tq7I3EnEUNbdoCtYr8gHM,1640
-stubber/stubs_from_docs.py,sha256=uxOCIWKxCAIfYpFBdIB0ZCghbJEJVgRGdW78deHAU54,3563
+stubber/stubs_from_docs.py,sha256=c19yVRAu7Kv0Vlpoa15obGIzhekisJuIyYwX1lug6-c,3563
 stubber/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/tools/manifestfile.py,sha256=YzPMc7PNciLOBpoc4xgUZ38t88C1C8b4fjG0qfWd6K8,25749
 stubber/tools/readme.md,sha256=uI0higcFUtjSLKobn7NK2LoqZ0BqcbftXSDgNjbsnzo,284
-stubber/typing_collector.py,sha256=YyNgxqgbWC_KQVO7ixUf_3XTFz6OhriboHK1RVX8_eY,9180
+stubber/typing_collector.py,sha256=c3e3sX-q-xg8q-DAoNl7Yi6qMnMH9I2RCv37c-wkzXs,9510
 stubber/update_fallback.py,sha256=mFxFvcLWl-5IX9BdRuo_WMa538Wtomo2sE14jKbW7-0,4913
 stubber/update_module_list.py,sha256=OEAOnFxB8Ywakw0pxiiTrIplWmoJ9r3Cdn07EpVDmNY,4038
 stubber/utils/__init__.py,sha256=73LiuTInDABhDhnDixU8ojlkVUjR5e3Uv8QNaeBMG0E,234
 stubber/utils/config.py,sha256=wPmSSut9PWjLFzr_8jj7IwkrVsL4mq17X8DGOeRqXGw,5544
 stubber/utils/makeversionhdr.py,sha256=dO8sWLAY_ifT1IJJ1-JJ2z_thvfqJnK3c1_bHF_UI28,1953
 stubber/utils/manifest.py,sha256=KEeFwVCke2XlUv8-g9S10DaoHzISZDxZn0G4LrHn2vA,3239
-stubber/utils/post.py,sha256=lHGPO_q-ZQgx03P0vEwZDVr0pCNt5-gY-DXW62DBeQM,2926
-stubber/utils/repos.py,sha256=piUZwtHBXXJ-XPhvw_qXYqO-fy1ktZsb9-7CAwNo2YQ,5896
-stubber/utils/stubmaker.py,sha256=pO8Bo9JuHo6eeJGJz4hO2PzVJojNYFdJPdVtlgjKkBI,5236
+stubber/utils/post.py,sha256=1yv5RNQnvHbgTGJ97nYFAh7imzg8NUtyPRDqQMqE3jo,2928
+stubber/utils/repos.py,sha256=kI2VcbKS1sNzFRr8mUDMdKYOYRvxpFIwy7JRyQ5Nxuk,7147
+stubber/utils/stubmaker.py,sha256=gB6n41o13WcShnSzc_lyoTFplotaPSQ3hekoLJvd2BU,5236
 stubber/utils/typed_config_toml.py,sha256=ZR7eo-whyL4nhFXj6xs7E121sLuE-ivlUDevII4K2xg,2653
 stubber/variants.py,sha256=NnwUP-aiGUPAn15BeRRFcBWQUOzAFFnN2oL4u9zio-s,3792
-micropython_stubber-1.24.4.dist-info/entry_points.txt,sha256=JoR8NWh8t6pbDyn0WOMCIfRfDQAOGxqbOgJWuxv3Cxw,116
-micropython_stubber-1.24.4.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
-micropython_stubber-1.24.4.dist-info/METADATA,sha256=hW8u3xr5kRDcjoTsF9lZa5fw28XnI3LeHg1PKBbl47Q,19979
-micropython_stubber-1.24.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-micropython_stubber-1.24.4.dist-info/RECORD,,
+micropython_stubber-1.25.0.post1.dist-info/entry_points.txt,sha256=JoR8NWh8t6pbDyn0WOMCIfRfDQAOGxqbOgJWuxv3Cxw,116
+micropython_stubber-1.25.0.post1.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
+micropython_stubber-1.25.0.post1.dist-info/METADATA,sha256=d1eFvb-pYR0v0yNKdiVj7FwzSRryX5zzHRl6d8OwdU8,19978
+micropython_stubber-1.25.0.post1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+micropython_stubber-1.25.0.post1.dist-info/RECORD,,

stubber/__init__.py

@@ -1,3 +1,3 @@
 """get the version"""
 
-__version__ = "1.24.3"
+__version__ = "1.25.0"

stubber/board/createstubs.py

@@ -24,7 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.24.0"
+__version__ = "v1.25.0"
 ENOENT = 2 # on most ports
 ENOMESSAGE = 44 # on pyscript
 _MAX_CLASS_LEVEL = 2  # Max class nesting
@@ -82,12 +82,13 @@ class Stubber:
         self.info = _info()
         log.info("Port: {}".format(self.info["port"]))
         log.info("Board: {}".format(self.info["board"]))
+        log.info("Board_ID: {}".format(self.info["board_id"]))
         gc.collect()
         if firmware_id:
             self._fwid = firmware_id.lower()
         else:
             if self.info["family"] == "micropython":
-                self._fwid = "{family}-v{version}-{port}-{board}".format(**self.info).rstrip("-")
+                self._fwid = "{family}-v{version}-{port}-{board_id}".format(**self.info).rstrip("-")
             else:
                 self._fwid = "{family}-v{version}-{port}".format(**self.info)
         self._start_free = gc.mem_free()  # type: ignore
@@ -545,6 +546,8 @@ def _info():  # type:() -> dict[str, str]
             "ver": "",
             "port": sys.platform,  # port: esp32 / win32 / linux / stm32
             "board": "UNKNOWN",
+            "board_id": "",
+            "variant": "",
             "cpu": "",
             "mpy": "",
             "arch": "",
@@ -565,8 +568,12 @@ def _info():  # type:() -> dict[str, str]
         _machine = (
             sys.implementation._machine if "_machine" in dir(sys.implementation) else os.uname().machine  # type: ignore
         )
-        # info["board"] = "with".join(_machine.split("with")[:-1]).strip()
-        info["board"] = _machine
+        info["board"] = _machine.strip()
+        si_build = sys.implementation._build if "_build" in dir(sys.implementation) else ""
+        if si_build:
+            info["board"] = si_build.split("-")[0]
+            info["variant"] = si_build.split("-")[1] if "-" in si_build else ""
+        info["board_id"] = si_build
         info["cpu"] = _machine.split("with")[-1].strip()
         info["mpy"] = (
             sys.implementation._mpy  # type: ignore
@@ -575,7 +582,8 @@ def _info():  # type:() -> dict[str, str]
         )
     except (AttributeError, IndexError):
         pass
-    info["board"] = get_boardname()
+    if not info["board_id"]:
+        get_boardname(info)
 
     try:
         if "uname" in dir(os):  # old
@@ -668,16 +676,18 @@ def version_str(version: tuple):  #  -> str:
     return v_str
 
 
-def get_boardname() -> str:
-    "Read the board name from the boardname.py file that may have been created upfront"
+def get_boardname(info: dict) -> str:
+    "Read the board_id from the boardname.py file that may have been created upfront"
     try:
-        from boardname import BOARDNAME  # type: ignore
+        from boardname import BOARD_ID  # type: ignore
 
-        log.info("Found BOARDNAME: {}".format(BOARDNAME))
+        log.info("Found BOARD_ID: {}".format(BOARD_ID))
     except ImportError:
-        log.warning("BOARDNAME not found")
-        BOARDNAME = ""
-    return BOARDNAME
+        log.warning("BOARD_ID not found")
+        BOARD_ID = ""
+    info["board_id"] = BOARD_ID
+    info["board"] = BOARD_ID.split("-")[0] if "-" in BOARD_ID else BOARD_ID
+    info["variant"] == BOARD_ID.split("-")[1] if "-" in BOARD_ID else ""
 
 
 def get_root() -> str:  # sourcery skip: use-assigned-variable

stubber/board/createstubs_db.py

@@ -18,7 +18,7 @@ Create stubs for (all) modules on a MicroPython board.
     - cross compilation, using mpy-cross, to avoid the compilation step on the micropython device 
 
 
-This variant was generated from createstubs.py by micropython-stubber v1.24.3
+This variant was generated from createstubs.py by micropython-stubber v1.24.4
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -43,7 +43,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.24.0"
+__version__ = "v1.25.0"
 ENOENT = 2  # on most ports
 ENOMESSAGE = 44  # on pyscript
 _MAX_CLASS_LEVEL = 2  # Max class nesting
@@ -101,12 +101,13 @@ class Stubber:
         self.info = _info()
         log.info("Port: {}".format(self.info["port"]))
         log.info("Board: {}".format(self.info["board"]))
+        log.info("Board_ID: {}".format(self.info["board_id"]))
         gc.collect()
         if firmware_id:
             self._fwid = firmware_id.lower()
         else:
             if self.info["family"] == "micropython":
-                self._fwid = "{family}-v{version}-{port}-{board}".format(**self.info).rstrip("-")
+                self._fwid = "{family}-v{version}-{port}-{board_id}".format(**self.info).rstrip("-")
             else:
                 self._fwid = "{family}-v{version}-{port}".format(**self.info)
         self._start_free = gc.mem_free()  # type: ignore
@@ -541,6 +542,8 @@ def _info():  # type:() -> dict[str, str]
             "ver": "",
             "port": sys.platform,  # port: esp32 / win32 / linux / stm32
             "board": "UNKNOWN",
+            "board_id": "",
+            "variant": "",
             "cpu": "",
             "mpy": "",
             "arch": "",
@@ -559,8 +562,12 @@ def _info():  # type:() -> dict[str, str]
         pass
     try:
         _machine = sys.implementation._machine if "_machine" in dir(sys.implementation) else os.uname().machine  # type: ignore
-        # info["board"] = "with".join(_machine.split("with")[:-1]).strip()
-        info["board"] = _machine
+        info["board"] = _machine.strip()
+        si_build = sys.implementation._build if "_build" in dir(sys.implementation) else ""
+        if si_build:
+            info["board"] = si_build.split("-")[0]
+            info["variant"] = si_build.split("-")[1] if "-" in si_build else ""
+        info["board_id"] = si_build
         info["cpu"] = _machine.split("with")[-1].strip()
         info["mpy"] = (
             sys.implementation._mpy  # type: ignore
@@ -569,7 +576,8 @@ def _info():  # type:() -> dict[str, str]
         )
     except (AttributeError, IndexError):
         pass
-    info["board"] = get_boardname()
+    if not info["board_id"]:
+        get_boardname(info)
 
     try:
         if "uname" in dir(os):  # old
@@ -661,16 +669,18 @@ def version_str(version: tuple):  #  -> str:
     return v_str
 
 
-def get_boardname() -> str:
-    "Read the board name from the boardname.py file that may have been created upfront"
+def get_boardname(info: dict) -> str:
+    "Read the board_id from the boardname.py file that may have been created upfront"
     try:
-        from boardname import BOARDNAME  # type: ignore
+        from boardname import BOARD_ID  # type: ignore
 
-        log.info("Found BOARDNAME: {}".format(BOARDNAME))
+        log.info("Found BOARD_ID: {}".format(BOARD_ID))
     except ImportError:
-        log.warning("BOARDNAME not found")
-        BOARDNAME = ""
-    return BOARDNAME
+        log.warning("BOARD_ID not found")
+        BOARD_ID = ""
+    info["board_id"] = BOARD_ID
+    info["board"] = BOARD_ID.split("-")[0] if "-" in BOARD_ID else BOARD_ID
+    info["variant"] == BOARD_ID.split("-")[1] if "-" in BOARD_ID else ""
 
 
 def get_root() -> str:  # sourcery skip: use-assigned-variable
@@ -746,7 +756,7 @@ def get_modules(skip=0):
         if not file_exists(fname):
             continue
         try:
-            with open(fname) as f:
+            with open(fname, encoding="utf-8") as f:
                 i = 0
                 while True:
                     line = f.readline().strip()