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

mpflash/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "1.0.2"
+version = "1.24.6"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
@@ -18,6 +18,7 @@ classifiers = [
 mpflash = "mpflash.cli_main:mpflash"
 
 [tool.poetry.dependencies]
+python = ">=3.9,<4.0"
 beautifulsoup4 = "^4.12.3"
 bincopy = "^20.0.0"
 blkinfo = "^0.2.0"
@@ -29,16 +30,16 @@ jsons = "^1.6.3"
 libusb = { version = "^1.0.27", platform = "win32" }
 loguru = "^0.7.2"
 mpremote = "^1.22.0"
-packaging = "23.2"
+packaging = "^24.2"
 platformdirs = "^4.2.0"
 psutil = "^5.9.8"
 pygithub = "^2.1.1"
-python = ">=3.8.1,<4.0"
 pyusb = "^1.2.1"
 requests = "^2.31.0"
 rich-click = "^1.8.1"
 tenacity = "8.2.3"
 cache-to-disk = "^2.0.0"
+poetry = "^2.0.1"
 
 
 [tool.poetry.group.dev]

stubber/__init__.py

@@ -1,3 +1,3 @@
 """get the version"""
 
-__version__ = "1.23.2"
+__version__ = "1.24.0"

stubber/board/createstubs.py

@@ -24,8 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.23.2"
-version_str = __version__.rsplit(".", 1)[0]
+__version__ = "v1.24.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -33,7 +32,7 @@ LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
 
 # our own logging module to avoid dependency on and interfering with logging module
 class logging:
-    # DEBUG = 10
+    DEBUG = 10
     INFO = 20
     WARNING = 30
     ERROR = 40
@@ -48,9 +47,9 @@ class logging:
     def basicConfig(cls, level):
         cls.level = level
 
-    # def debug(self, msg):
-    #     if self.level <= logging.DEBUG:
-    #         self.prnt("DEBUG :", msg)
+    def debug(self, msg):
+        if self.level <= logging.DEBUG:
+            self.prnt("DEBUG :", msg)
 
     def info(self, msg):
         if self.level <= logging.INFO:
@@ -232,11 +231,12 @@ class Stubber:
             return False
 
         # Start a new file
+        # log.debug("Create file: {}".format(file_name))
         ensure_folder(file_name)
         with open(file_name, "w") as fp:
             info_ = str(self.info).replace("OrderedDict(", "").replace("})", "}")
             s = '"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(
-                module_name, self._fwid, info_, version_str
+                module_name, self._fwid, info_, __version__
             )
             fp.write(s)
             fp.write(
@@ -355,8 +355,10 @@ class Stubber:
 
                 if t in ("str", "int", "float", "bool", "bytearray", "bytes"):
                     # known type: use actual value
-                    # s = "{0}{1} = {2} # type: {3}\n".format(indent, item_name, item_repr, t)
-                    s = "{0}{1}: {3} = {2}\n".format(indent, item_name, item_repr, t)
+                    if item_name.upper() == item_name:  # ALL_CAPS --> Final
+                        s = "{0}{1}: Final[{3}] = {2}\n".format(indent, item_name, item_repr, t)
+                    else:
+                        s = "{0}{1}: {3} = {2}\n".format(indent, item_name, item_repr, t)
                 elif t in ("dict", "list", "tuple"):
                     # dict, list , tuple: use empty value
                     ev = {"dict": "{}", "list": "[]", "tuple": "()"}
@@ -444,7 +446,7 @@ class Stubber:
                 f.write("{")
                 f.write(dumps({"firmware": self.info})[1:-1])
                 f.write(",\n")
-                f.write(dumps({"stubber": {"version": version_str}, "stubtype": "firmware"})[1:-1])
+                f.write(dumps({"stubber": {"version": __version__}, "stubtype": "firmware"})[1:-1])
                 f.write(",\n")
                 f.write('"modules" :[\n')
 
@@ -495,6 +497,7 @@ def ensure_folder(path: str):
                 # folder does not exist
                 if e.args[0] == ENOENT:
                     try:
+                        log.debug("Create folder {}".format(p))
                         os.mkdir(p)
                     except OSError as e2:
                         log.error("failed to create folder {}".format(p))
@@ -505,7 +508,7 @@ def ensure_folder(path: str):
 
 def _build(s):
     # extract build from sys.version or os.uname().version if available
-    # sys.version: 'MicroPython v1.23.2-preview.6.g3d0b6276f'
+    # sys.version: 'MicroPython v1.24.0-preview.6.g3d0b6276f'
     # sys.implementation.version: 'v1.13-103-gb137d064e'
     if not s:
         return ""
@@ -613,29 +616,33 @@ def _info():  # type:() -> dict[str, str]
             info["version"]
             and info["version"].endswith(".0")
             and info["version"]
-            >= "1.10.0"  # versions from 1.10.0 to 1.23.2 do not have a micro .0
+            >= "1.10.0"  # versions from 1.10.0 to 1.24.0 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.23.2 do not have a micro .0
+            # versions from 1.10.0 to 1.24.0 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable
     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",
+                "rv32imc",
+            ][sys_mpy >> 10]
+        except IndexError:
+            arch = "unknown"
         if arch:
             info["arch"] = arch
         # .mpy version.minor
@@ -675,7 +682,7 @@ def get_root() -> str:  # sourcery skip: use-assigned-variable
         # unix port
         c = "."
     r = c
-    for r in [c, "/sd", "/flash", "/", "."]:
+    for r in ["/remote", "/sd", "/flash", "/", c, "."]:
         try:
             _ = os.stat(r)
             break
@@ -819,6 +826,8 @@ def main():
         "breakout_trackball",
         "breakout_vl53l5cx",
         "btree",
+        "builtins",
+        "cc3200",
         "cmath",
         "collections",
         "crypto",
@@ -829,10 +838,12 @@ def main():
         "display",
         "display_driver_utils",
         "ds18x20",
+        "embed",
         "encoder",
         "errno",
         "esp",
         "esp32",
+        "esp8266",
         "espidf",
         "espnow",
         "ffi",
@@ -867,11 +878,13 @@ def main():
         "lvgl",
         "lwip",
         "machine",
+        "marshal",
         "math",
         "microWebSocket",
         "microWebSrv",
         "microWebTemplate",
         "micropython",
+        "mimxrt",
         "mip",
         "mip/__init__",
         "mip/__main__",
@@ -880,11 +893,13 @@ def main():
         "mpu9250",
         "neopixel",
         "network",
+        "nrf",
         "ntptime",
         "onewire",
         "openamp",
         "os",
         "pcf85063a",
+        "pic16bit",
         "picoexplorer",
         "picographics",
         "picokeypad",
@@ -896,12 +911,16 @@ def main():
         "pimoroni_i2c",
         "plasma",
         "platform",
+        "powerpc",
         "pyb",
         "pycom",
         "pye",
+        "qemu",
         "qrcode",
         "queue",
         "random",
+        "renesas",
+        "renesas-ra",
         "requests",
         "requests/__init__",
         "rp2",
@@ -914,6 +933,7 @@ def main():
         "ssh",
         "ssl",
         "stm",
+        "stm32",
         "struct",
         "sys",
         "termios",
@@ -954,6 +974,7 @@ def main():
         "umqtt/__init__",
         "umqtt/robust",
         "umqtt/simple",
+        "unix",
         "uos",
         "uplatform",
         "uqueue",
@@ -979,8 +1000,10 @@ def main():
         "uzlib",
         "version",
         "vfs",
+        "webassembly",
         "websocket",
         "websocket_helper",
+        "windows",
         "wipy",
         "writer",
         "xpt2046",
@@ -996,6 +1019,7 @@ def main():
 
 if __name__ == "__main__" or is_micropython():
     if not file_exists("no_auto_stubber.txt"):
+        print(f"createstubs.py: {__version__}")
         try:
             gc.threshold(4 * 1024)  # type: ignore
             gc.enable()

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.23.2
+This variant was generated from createstubs.py by micropython-stubber v1.24.0
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -43,8 +43,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.23.2"
-version_str = __version__.rsplit(".", 1)[0]
+__version__ = "v1.24.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -52,7 +51,7 @@ LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
 
 # our own logging module to avoid dependency on and interfering with logging module
 class logging:
-    # DEBUG = 10
+    DEBUG = 10
     INFO = 20
     WARNING = 30
     ERROR = 40
@@ -67,9 +66,9 @@ class logging:
     def basicConfig(cls, level):
         cls.level = level
 
-    # def debug(self, msg):
-    #     if self.level <= logging.DEBUG:
-    #         self.prnt("DEBUG :", msg)
+    def debug(self, msg):
+        if self.level <= logging.DEBUG:
+            self.prnt("DEBUG :", msg)
 
     def info(self, msg):
         if self.level <= logging.INFO:
@@ -245,10 +244,11 @@ class Stubber:
             return False
 
         # Start a new file
+        # log.debug("Create file: {}".format(file_name))
         ensure_folder(file_name)
         with open(file_name, "w") as fp:
             info_ = str(self.info).replace("OrderedDict(", "").replace("})", "}")
-            s = '"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(module_name, self._fwid, info_, version_str)
+            s = '"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(module_name, self._fwid, info_, __version__)
             fp.write(s)
             fp.write("from __future__ import annotations\nfrom typing import Any, Generator\nfrom _typeshed import Incomplete\n\n")
             self.write_object_stub(fp, new_module, module_name, "")
@@ -358,8 +358,10 @@ class Stubber:
 
                 if t in ("str", "int", "float", "bool", "bytearray", "bytes"):
                     # known type: use actual value
-                    # s = "{0}{1} = {2} # type: {3}\n".format(indent, item_name, item_repr, t)
-                    s = "{0}{1}: {3} = {2}\n".format(indent, item_name, item_repr, t)
+                    if item_name.upper() == item_name:  # ALL_CAPS --> Final
+                        s = "{0}{1}: Final[{3}] = {2}\n".format(indent, item_name, item_repr, t)
+                    else:
+                        s = "{0}{1}: {3} = {2}\n".format(indent, item_name, item_repr, t)
                 elif t in ("dict", "list", "tuple"):
                     # dict, list , tuple: use empty value
                     ev = {"dict": "{}", "list": "[]", "tuple": "()"}
@@ -443,7 +445,7 @@ class Stubber:
                 f.write("{")
                 f.write(dumps({"firmware": self.info})[1:-1])
                 f.write(",\n")
-                f.write(dumps({"stubber": {"version": version_str}, "stubtype": "firmware"})[1:-1])
+                f.write(dumps({"stubber": {"version": __version__}, "stubtype": "firmware"})[1:-1])
                 f.write(",\n")
                 f.write('"modules" :[\n')
 
@@ -492,6 +494,7 @@ def ensure_folder(path: str):
                 # folder does not exist
                 if e.args[0] == ENOENT:
                     try:
+                        log.debug("Create folder {}".format(p))
                         os.mkdir(p)
                     except OSError as e2:
                         log.error("failed to create folder {}".format(p))
@@ -502,7 +505,7 @@ def ensure_folder(path: str):
 
 def _build(s):
     # extract build from sys.version or os.uname().version if available
-    # sys.version: 'MicroPython v1.23.2-preview.6.g3d0b6276f'
+    # sys.version: 'MicroPython v1.24.0-preview.6.g3d0b6276f'
     # sys.implementation.version: 'v1.13-103-gb137d064e'
     if not s:
         return ""
@@ -607,29 +610,33 @@ 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.23.2 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.24.0 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.23.2 do not have a micro .0
+            # versions from 1.10.0 to 1.24.0 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable
     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",
+                "rv32imc",
+            ][sys_mpy >> 10]
+        except IndexError:
+            arch = "unknown"
         if arch:
             info["arch"] = arch
         # .mpy version.minor
@@ -669,7 +676,7 @@ def get_root() -> str:  # sourcery skip: use-assigned-variable
         # unix port
         c = "."
     r = c
-    for r in [c, "/sd", "/flash", "/", "."]:
+    for r in ["/remote", "/sd", "/flash", "/", c, "."]:
         try:
             _ = os.stat(r)
             break
@@ -818,6 +825,7 @@ def main():
 
 if __name__ == "__main__" or is_micropython():
     if not file_exists("no_auto_stubber.txt"):
+        print(f"createstubs.py: {__version__}")
         try:
             gc.threshold(4 * 1024)  # type: ignore
             gc.enable()