micropython-stubber 1.14.0__py3-none-any.whl → 1.14.1__py3-none-any.whl

{micropython_stubber-1.14.0.dist-info → micropython_stubber-1.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.14.0
+Version: 1.14.1
 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: click (>=8.1.3,<9.0.0)
 Requires-Dist: esptool (>=4.4,<5.0) ; extra == "tools"
 Requires-Dist: importlib-metadata (>=1.0,<2.0) ; python_version < "3.8"
 Requires-Dist: libcst (>=0.4.9,<0.5.0)
-Requires-Dist: loguru (>=0.6.0,<0.7.0)
+Requires-Dist: loguru (>=0.6,<0.8)
 Requires-Dist: mypy (==1.2.0)
 Requires-Dist: packaging (>=21.3,<24.0)
 Requires-Dist: pipx (>=1.1.0,<2.0.0)

{micropython_stubber-1.14.0.dist-info → micropython_stubber-1.14.1.dist-info}/RECORD

@@ -1,19 +1,19 @@
-stubber/__init__.py,sha256=saE7dmArw0EzaTpOxEbunMW3VUZIFbfeDlqlwnKfnSQ,51
+stubber/__init__.py,sha256=nunsyHrLLDdxrMp6ILZsR5CbHB9aTak-y0aGGyMMZpg,51
 stubber/basicgit.py,sha256=uyfC_ZqfG5z8tIyBJV_8fZR8SWeuzx3X-p5juGHaGA4,9378
 stubber/board/board_info.csv,sha256=e3xY-VTOh-iOmpGhhuADXnk3Rq-17ID0PJr8eKSH5Fw,7040
 stubber/board/boot.py,sha256=XjWlKErU5nI1HJSugXIP_3hlwgRQboE6sJrpcbSygnk,1120
-stubber/board/createstubs.py,sha256=TI9HDixoFFylltD9eGdTO5uCcW-cxxJ1PVXRdges7Mo,30841
-stubber/board/createstubs_db.py,sha256=xersr9f2rdCCAcc4Pio_g-yQCO_Ch75hlZkEocqEcWI,28351
-stubber/board/createstubs_db_min.py,sha256=hq76FvgAaNBhJlJl9qzDmVshkFW4UlDd9O28d0zL844,10331
+stubber/board/createstubs.py,sha256=Y6mgjhENiSGY9Qai-j1kgaymV_XBaIe7gIeGxLM4GtA,30841
+stubber/board/createstubs_db.py,sha256=2Ak9tzarhnRJU4jxF1pQBXFeMYoYOdnXQoXre8UeWvc,28351
+stubber/board/createstubs_db_min.py,sha256=rIurAscBTwNEK2eb0WyhKpU3WHN2fSrKHqo1wrnfamI,10331
 stubber/board/createstubs_db_mpy.mpy,sha256=DRm_ssNg4u6-iKA2EBh5b0At_6YiuC_a7vUPygM6YdI,8466
 stubber/board/createstubs_info.py,sha256=jxj9sYalBJo5Wb73YGP83J_dqVFYk9KUtxa7p0kfFMo,30313
 stubber/board/createstubs_lvgl.py,sha256=gnJI-N_A_HJ_Jzr-F-qX7gN_Y2AEm9MNg46LHsKuaKg,25560
 stubber/board/createstubs_lvgl_min.py,sha256=_D-LtGRRPBC9gEwjpqBOgOEpfnoHn63szbh-lydCH74,9685
 stubber/board/createstubs_lvgl_mpy.mpy,sha256=mWaMfbBI2UEw4r4Kq7SmynMPOiTC577-gJIPIzgR35Y,8002
-stubber/board/createstubs_mem.py,sha256=1JWIG5uA5W3yBVU1uNeW6Fx9qaixcLQTgGJr-4Plokw,26219
-stubber/board/createstubs_mem_min.py,sha256=_p1GpUoqsCIy3EdodXTsxu1nabzH7zQ-yWcLGTAcWO8,9706
+stubber/board/createstubs_mem.py,sha256=YorlCSpRLQnaBieFSVjv7V4hCRazqHEd3C4N3xCyNyY,26219
+stubber/board/createstubs_mem_min.py,sha256=ZA17xO6SVr7DPSOWkrc99XalkHA-ae-ipldQblXCa7o,9706
 stubber/board/createstubs_mem_mpy.mpy,sha256=H71GSmt4LLDbSJ3pxafaDQ-EH6Tz2yzAcY5PJRsmzv4,7950
-stubber/board/createstubs_min.py,sha256=RAEsyMvYzgadhL7buzldvidErj1jCqLVjxOeq369frw,12065
+stubber/board/createstubs_min.py,sha256=O8KCrUkAli_ejXUo95ANIuoe8AVvm6pFbLB-1VamgnU,12065
 stubber/board/createstubs_mpy.mpy,sha256=R2RsMkQ2LJroSqplaMM24mAGmPvwL13pyYsBlVjznaU,10821
 stubber/board/logging.py,sha256=rdneoAwZg84uiWBJWYIp0gMcT2oU9Lu-1WIu1LqT_9w,2218
 stubber/board/main.py,sha256=f6V3tdt6sPZVLuwemT-NLuK9GySfW2c2J6PJMOOWQQw,413
@@ -50,8 +50,8 @@ stubber/commands/upd_fallback_cmd.py,sha256=5d6lIFa1mTo-2O-gDZKwHOZAo5bvX5mp4iaT
 stubber/commands/upd_module_list_cmd.py,sha256=drtjqS2aMd0aM-JJdnyl4jcnbq135lfSVcgK_6eovBk,499
 stubber/commands/variants_cmd.py,sha256=xCnR6vMQ-Q1zETn82reOhUQMQotXWt9y5dRBR7ewE2U,1313
 stubber/cst_transformer.py,sha256=57ILkYBYWKQmq9Iz2VuP5_L4oksC9ofQVV4Gw-3veqU,6367
-stubber/data/board_info.csv,sha256=nO9r_uUIvAR7knLYLMG_YG2D6rkEJpM363trV_0cyY4,7074
-stubber/data/board_info.json,sha256=fUXx3DxfScK2hf7soVGp33EN8sQGW-VBbmKdx4xL_vs,46378
+stubber/data/board_info.csv,sha256=d64tfwmgkS491hgB4YN9kap7Tu7Hs4oUXxd-mHnXGyY,7120
+stubber/data/board_info.json,sha256=7wwkNESVm_nSKwGIutS9nWPRdIkamGtXhivgF4ZNRLk,46684
 stubber/data/micropython_tags.csv,sha256=HQnzPN7jLmgKX3QvobsPMZa-xMb0exglriFziBjaRz8,1909
 stubber/data/requirements-core-micropython.txt,sha256=6RQWWbLh8YVcD_l1-hjg6wX_Fm1LmNEwy5NExKJIkeg,1317
 stubber/data/requirements-core-pycopy.txt,sha256=tW71l6FIuoQY1tuxkDgeN4Uw8IIp0YrlhhaaqSGSOA8,1051
@@ -63,23 +63,23 @@ stubber/freeze/freeze_manifest_2.py,sha256=Vdrs2A5vvDDZ4WamcHG9sleKqNYGwIJ5yNQXp
 stubber/freeze/get_frozen.py,sha256=5sU70m9HiTkbLCvTQMKDa13NLywijqThw6BuF3A71FE,4937
 stubber/get_cpython.py,sha256=RYL3HHbNjaapT0JQZaLVd8wLSfm6RB6XpVELOae1z98,3782
 stubber/get_lobo.py,sha256=jyysWbeEwNuZZtkTudJP1QbyVvh-TwFom5cE7iCi9lE,1776
-stubber/minify.py,sha256=QWKplaQjiS0Qtf_dHTJs1reuYVpRxk5Dkb3_H6Co2jc,13380
+stubber/minify.py,sha256=Pm2itd4Wugk3U15dBb5bnw13JRzYoNXueom3n_ZrUTw,13483
 stubber/publish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/publish/bump.py,sha256=k69CID3nURPckyepABG-5u3U_VMiYADqZ2Oxl8x_zC0,3271
 stubber/publish/candidates.py,sha256=3TbmrGL436Bx5PTf-cQ4C6j4p2MDR8ywefNIdoPR2wY,10684
 stubber/publish/database.py,sha256=CLy5oiLasA-YzTTXi9d01qLAyk7NpugCDUOa5R9Ac2g,623
 stubber/publish/enums.py,sha256=YI_0q3Iz3v1YqDuHgbuj7x6FBS5y5w3G1UdgpCGunNs,954
-stubber/publish/merge_docstubs.py,sha256=Pb0poHeivgBmW0I7qhLX-lfq5z1zgF0JEAgCi0NqYy8,6718
+stubber/publish/merge_docstubs.py,sha256=O9kWJbW13mGJpupToI1M6VF7ofS7HDIVGdXLkFvIwok,6804
 stubber/publish/missing_class_methods.py,sha256=8i4Znit5vOaGjuXlFn_BYBIEt7G45i0l0gbj1hWKgb8,1771
 stubber/publish/package.py,sha256=ihhJrS2eqparkv1DfosSTivPqWoGlKKKOFnI8A5tbCg,6026
 stubber/publish/publish.py,sha256=7hwaB4P04432XXQNRhV34NP5cwnkkrz2SUUSXnmjI5I,3518
 stubber/publish/pypi.py,sha256=Mu1F7Xx4e0NPWK1_Erck6QGEfdY8w67EBeWFi6JiAzk,1240
-stubber/publish/stubpacker.py,sha256=r5MpXmPHgcOgU8MoGWEDMPQOiYs_5IdiqgD9Ki3Y8a4,33512
+stubber/publish/stubpacker.py,sha256=R4laCYbWcG7bN_gFSi6ViBJn3OZ6gxTJRPN1Dz-yfMQ,34964
 stubber/rst/__init__.py,sha256=5VcbDCotIICa2xnJDs_gw2sFXpjjGOZZbwCrNKXy1OE,293
 stubber/rst/classsort.py,sha256=YCmF4QEYXqZ1Yu2FZb1iPQBrVkq-mrZaBaRcSUlC7ZE,2655
-stubber/rst/lookup.py,sha256=5Iqt174_kJpH6Ae7RbQTCs_r5ZCFjVmXGAbSIYge4os,19680
-stubber/rst/output_dict.py,sha256=wbpPKhdnHJMC7IKFLGs69Xh3PWwytgx8P8DXUoBvgHM,13997
-stubber/rst/reader.py,sha256=gNvzU5GcRcaMBvXVwIcHf5dZP4NrVpInpKoJmQm2UYA,32041
+stubber/rst/lookup.py,sha256=RZ-fm5kyHv-AEvAKauttvPMgGcPYlUActJyiZNDR-UE,20110
+stubber/rst/output_dict.py,sha256=cpBXRtUD-uh0EgjWIBiRrMLBmIAEXjoJFSOAg-qJQiU,14755
+stubber/rst/reader.py,sha256=B14fvWyx83JSH8oYMfQNWMM4kEqQUcY47FqQVasea78,32051
 stubber/rst/report_return.py,sha256=WZJSbgjsjxFeCeY-vLms56gv_x3TubaGXGQ8--d8RqI,2814
 stubber/rst/rst_utils.py,sha256=q4MCmhCeI0fnx6KNVdgz1nE4_hAK4T-F7oAMBnmwZ4w,17817
 stubber/stubber.py,sha256=fPMqCT68AY8UEe2njlnbAU9vK87ZF3i7OAIJNCONsZY,1957
@@ -90,7 +90,7 @@ stubber/tools/readme.md,sha256=kH7dA2Rs4BLCXa2ILoTDIj3sJHcGYtDPntyxVIOXvtI,199
 stubber/update_fallback.py,sha256=gRR-qxirz5uL0fALWJaI3PPb63_wIm-eETyB7paH0nk,4670
 stubber/update_module_list.py,sha256=5l8yVwRaaMx6iQldk5AxBcqoVab7A4aE3SuO3duTrWg,4584
 stubber/utils/__init__.py,sha256=tAmo9fjxIkMsmH4ZkgNB05zODEO_WjHDLXZFKk3SS3U,205
-stubber/utils/config.py,sha256=rrSgfJ-Gxcyk2JLsoI2KNGZ7vHO0mvxyzK35ZTxiO_I,4556
+stubber/utils/config.py,sha256=H-QDGtjB90ezAU0Avfu5QBe65ANXvVcId03tnFv4Viw,4865
 stubber/utils/makeversionhdr.py,sha256=ZRpClirIzNK4saZHPaDuEpXhBRI_Ow_yZOxeNM3D_Ro,1908
 stubber/utils/manifest.py,sha256=XBYCkxtYVAdUcch1784eHPAXlXfyfjco4WnRXxBHZYA,3273
 stubber/utils/post.py,sha256=Uq9HZn6hNZUABpQs7a7PM3zz0ncwzDJTqKbFKsywsDY,2662
@@ -99,8 +99,8 @@ stubber/utils/stubmaker.py,sha256=jX4DvPzgv3wWNnUVaXjpTitRNZZ9QbcvmnDsI0lshGc,43
 stubber/utils/typed_config_toml.py,sha256=ikifCIZGNhS_uqsfp6IwIpxdtZqbLtywprjWG_Q0y8o,2629
 stubber/utils/versions.py,sha256=_xSOwpJV0gAO-TK2KHu-Ze3m__739f1YUVIxiHE2vqY,1859
 stubber/variants.py,sha256=Tm5PfHwKa_rrKAYWXtiNompqAJcD_DOV1B6lJD7L5Bg,3747
-micropython_stubber-1.14.0.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
-micropython_stubber-1.14.0.dist-info/LICENSE,sha256=2zsOXlYgl9W7_XGXcncAXIYfvSVlyNcVBycC6hhlKhA,1542
-micropython_stubber-1.14.0.dist-info/METADATA,sha256=anlqy3tJTshIMFjFd6HJC0SIyXDwTiUHPJwwiuo84hs,16626
-micropython_stubber-1.14.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-micropython_stubber-1.14.0.dist-info/RECORD,,
+micropython_stubber-1.14.1.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
+micropython_stubber-1.14.1.dist-info/LICENSE,sha256=2zsOXlYgl9W7_XGXcncAXIYfvSVlyNcVBycC6hhlKhA,1542
+micropython_stubber-1.14.1.dist-info/METADATA,sha256=Y9ZdKjlHGAH4dSVi5sX13gxM0Mgvyl5hX-M1vUh84aQ,16622
+micropython_stubber-1.14.1.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+micropython_stubber-1.14.1.dist-info/RECORD,,

stubber/__init__.py

@@ -1,4 +1,4 @@
 """get the version"""
 
 
-__version__ = "1.14.0"
+__version__ = "1.14.1"

stubber/board/createstubs.py

@@ -20,7 +20,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.14.0"
+__version__ = "v1.14.1"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]

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.14.0
+This variant was generated from createstubs.py by micropython-stubber v1.14.1
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 # pylint: disable= invalid-name, missing-function-docstring, import-outside-toplevel, logging-not-lazy
@@ -39,7 +39,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.14.0"
+__version__ = "v1.14.1"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]

stubber/board/createstubs_db_min.py

@@ -42,7 +42,7 @@ try:from machine import reset
 except P:pass
 try:from collections import OrderedDict as d
 except P:from ucollections import OrderedDict as d
-__version__='v1.14.0'
+__version__='v1.14.1'
 w=2
 x=2
 e=[M,'/lib','/sd/lib','/flash/lib','lib']

stubber/board/createstubs_mem.py

@@ -9,7 +9,7 @@
     - 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.14.0
+This variant was generated from createstubs.py by micropython-stubber v1.14.1
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 # pylint: disable= invalid-name, missing-function-docstring, import-outside-toplevel, logging-not-lazy
@@ -30,7 +30,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.14.0"
+__version__ = "v1.14.1"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]

stubber/board/createstubs_mem_min.py

@@ -40,7 +40,7 @@ try:from machine import reset
 except P:pass
 try:from collections import OrderedDict as c
 except P:from ucollections import OrderedDict as c
-__version__='v1.14.0'
+__version__='v1.14.1'
 u=2
 v=2
 d=[L,'/lib','/sd/lib','/flash/lib','lib']

stubber/board/createstubs_min.py

@@ -44,7 +44,7 @@ try:from machine import reset
 except N:pass
 try:from collections import OrderedDict as d
 except N:from ucollections import OrderedDict as d
-__version__='v1.14.0'
+__version__='v1.14.1'
 x=2
 y=2
 z=[K,'/lib','/sd/lib','/flash/lib','lib']

stubber/data/board_info.csv

@@ -57,6 +57,7 @@ PCA10059 with NRF52840,PCA10059
 PCA10090 with NRF9160,PCA10090
 XIAO nRF52840 Sense with NRF52840,SEEED_XIAO_NRF52
 WT51822-S4AT with NRF51822,WT51822_S4AT
+PORTENTA C33 with RA6M5,ARDUINO_PORTENTA_C33
 EK-RA4M1 with RA4M1,EK_RA4M1
 EK-RA4W1 with RA4W1,EK_RA4W1
 EK-RA6M1 with RA6M1,EK_RA6M1

stubber/data/board_info.json

@@ -463,6 +463,14 @@
         "description": "WT51822-S4AT with NRF51822",
         "path": "repos/micropython/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h"
     },
+    {
+        "port": "renesas-ra",
+        "board": "ARDUINO_PORTENTA_C33",
+        "board_name": "PORTENTA C33",
+        "mcu_name": "RA6M5",
+        "description": "PORTENTA C33 with RA6M5",
+        "path": "repos/micropython/ports/renesas-ra/boards/ARDUINO_PORTENTA_C33/mpconfigboard.h"
+    },
     {
         "port": "renesas-ra",
         "board": "EK_RA4M1",

stubber/minify.py

@@ -229,6 +229,9 @@ def minify_script(source_script: StubSource, keep_report: bool = True, diff: boo
             ("rprint", 'self._log.info("Version: '),
             ("rprint", 'self._log.info("Port: '),
             ("rprint", 'self._log.info("Board: '),
+            # all others
+            ("comment", 'self._log.'),
+            ("comment", "_log ="),
         ]
     else:
         edits += [
@@ -304,7 +307,7 @@ def minify(
                     target = target / "minified.py"  # or raise error?
             target_buf = stack.enter_context(target.open("w+"))
         elif isinstance(target, IOBase):  # type: ignore
-            target_buf = target
+            target_buf = target 
         try:
             minified = minify_script(source_script=source_buf, keep_report=keep_report, diff=diff)
             target_buf.write(minified)

stubber/publish/merge_docstubs.py

@@ -28,7 +28,9 @@ def get_base(candidate: Dict[str, str], version: Optional[str] = None):
 def board_folder_name(fw: Dict, *, version: Optional[str] = None):
     """Return the name of the firmware folder. Can be in AnyCase."""
     base = get_base(fw, version=version)
-    folder_name = f"{base}-{fw['port']}" if fw["board"] in GENERIC else f"{base}-{fw['port']}-{fw['board']}"
+    folder_name = (
+        f"{base}-{fw['port']}" if fw["board"] in GENERIC else f"{base}-{fw['port']}-{fw['board']}"
+    )
     # do NOT force name to lowercase
     # remove GENERIC Prefix
     folder_name = folder_name.replace("-generic_", "-").replace("-GENERIC_", "-")
@@ -88,7 +90,7 @@ def merge_all_docstubs(
             if candidate["version"] == "latest":
                 # for the latest we do a bit more effort to get something 'good enough'
                 # try to get the board_path from the last released version as the basis
-                board_path = CONFIG.stub_path / board_folder_name(candidate, version=clean_version(CONFIG.stable_version, flat=True))
+                board_path = CONFIG.stub_path / board_folder_name(candidate, version="latest")
                 # check again
                 if board_path.exists():
                     log.info(f"using {board_path.name} as the basis for {merged_path.name}")
@@ -103,6 +105,7 @@ def merge_all_docstubs(
         log.info(f"Merge docstubs for {merged_path.name} {candidate['version']}")
         result = copy_and_merge_docstubs(board_path, merged_path, doc_path)
         # Add methods from docstubs to the firmware stubs that do not exist in the firmware stubs
+        # Add the __call__ method to the machine.Pin and pyb.Pin class
         add_machine_pin_call(merged_path, candidate["version"])
         if result:
             merged += 1
@@ -141,6 +144,7 @@ def copy_and_merge_docstubs(fw_path: Path, dest_path: Path, docstub_path: Path):
 
     # avoid duplicate modules : folder - file combinations
     # prefer folder from frozen stubs, over file from firmware stubs
+    # No frozen here - OLD code ?
     for f in dest_path.glob("*"):
         if f.is_dir():
             for suffix in [".py", ".pyi"]:

stubber/publish/stubpacker.py

@@ -30,6 +30,15 @@ from stubber.utils.versions import clean_version
 Status = NewType("Status", Dict[str, Union[str, None]])
 StubSources = List[Tuple[StubSource, Path]]
 
+# indicates which stubs will be skipped when copying for these stub sources
+STUB_SKIPPER = {
+    StubSource.FROZEN: ["espnow"],
+    StubSource.FIRMWARE: ["builtins"],
+    StubSource.DOC: [],
+    StubSource.CORE: [],
+    
+}
+
 
 class StubPackage:
     """
@@ -157,7 +166,9 @@ class StubPackage:
     def update_pkg_version(self, production: bool) -> str:
         """Get the next version for the package"""
         return (
-            self.get_prerelease_package_version(production) if self.mpy_version == "latest" else self.get_next_package_version(production)
+            self.get_prerelease_package_version(production)
+            if self.mpy_version == "latest"
+            else self.get_next_package_version(production)
         )
 
     def get_prerelease_package_version(self, production: bool = False) -> str:
@@ -165,9 +176,17 @@ class StubPackage:
         rc = 1
         if describe := get_git_describe(CONFIG.mpy_path.as_posix()):
             # use versiontag and the nummer of commits since the last tag
-            ver, rc, _ = describe.split("-", 2)
-            base = bump_version(Version(ver), minor_bump=True)
+            # "v1.19.1-841-g3446"
+            # 'v1.22.0-preview-19-g8eb7721b4'
+            parts = describe.split("-", 3)
+            ver = parts[0]
+            rc = parts[1] if parts[1].isdigit() else parts[2] if parts[2].isdigit() else 1
             rc = int(rc)
+            if parts[1] != "preview":
+                # old style - still need to guess the version
+                base = bump_version(Version(ver), minor_bump=True)
+            else:
+                base = Version(ver)
             return str(bump_version(base, rc=rc))
         else:
             raise ValueError("cannot determine next version number micropython")
@@ -273,12 +292,12 @@ class StubPackage:
     def update_sources(stub_sources: StubSources) -> StubSources:
         """
         Update the stub sources to:
-        - use the -merged folder for the firmware sources
-        - and fallback to use the GENERIC folder for the frozen sources
+        - FIRMWARE: prefer -merged stubs over bare firmware stubs
+        - FROZEN: fallback to use the GENERIC folder for the frozen sources if no board specific folder exists
         """
         updated_sources = []
         for stub_type, fw_path in stub_sources:
-            # update to use -merged
+            # prefer -merged stubs over bare firmwre stubs
             if stub_type == StubSource.FIRMWARE:
                 # Check if -merged folder exists and use that instead
                 if fw_path.name.endswith("-merged"):
@@ -309,30 +328,29 @@ class StubPackage:
          - 3 - remove *.py files from the package folder
         """
         try:
-            # update to -menrge and fallback to GENERIC
+            # update to -merged and fallback to GENERIC
             self.stub_sources = self.update_sources(self.stub_sources)
             # Check if all stub source folders exist
-            for stub_type, fw_path in self.stub_sources:
-                if not (CONFIG.stub_path / fw_path).exists():  # and stub_type != StubSource.FROZEN:
-                    raise FileNotFoundError(f"Could not find stub source folder {CONFIG.stub_path / fw_path}")
+            for stub_type, src_path in self.stub_sources:
+                if not (CONFIG.stub_path / src_path).exists():
+                    raise FileNotFoundError(
+                        f"Could not find stub source folder {CONFIG.stub_path / src_path}"
+                    )
 
             # 1 - Copy  the stubs to the package, directly in the package folder (no folders)
             # for stub_type, fw_path in [s for s in self.stub_sources]:
             for n in range(len(self.stub_sources)):
-                stub_type, fw_path = self.stub_sources[n]
+                stub_type, src_path = self.stub_sources[n]
                 try:
-                    log.debug(f"Copying {stub_type} from {fw_path}")
-                    shutil.copytree(
-                        CONFIG.stub_path / fw_path,
-                        self.package_path,
-                        symlinks=True,
-                        dirs_exist_ok=True,
-                    )
+                    log.debug(f"Copying {stub_type} from {src_path}")
+                    self.copy_folder(stub_type, src_path)
                 except OSError as e:
                     if stub_type != StubSource.FROZEN:
-                        raise FileNotFoundError(f"Could not find stub source folder {fw_path}") from e
+                        raise FileNotFoundError(
+                            f"Could not find stub source folder {src_path}"
+                        ) from e
                     else:
-                        log.debug(f"Error copying stubs from : {CONFIG.stub_path / fw_path}, {e}")
+                        log.debug(f"Error copying stubs from : {CONFIG.stub_path / src_path}, {e}")
         finally:
             # 3 - clean up a little bit
             # delete all the .py files in the package folder if there is a corresponding .pyi file
@@ -340,6 +358,19 @@ class StubPackage:
                 if f.with_suffix(".pyi").exists():
                     f.unlink()
 
+    def copy_folder(self, stub_type: StubSource, src_path: Path):
+        Path(self.package_path).mkdir(parents=True, exist_ok=True)
+        for item in (CONFIG.stub_path / src_path).rglob("*"):
+            if item.is_file():
+                # filter the 'poorly' decorated files
+                if stub_type in STUB_SKIPPER:
+                    if item.stem in STUB_SKIPPER[stub_type]:
+                        continue
+
+                target = Path(self.package_path) / item.relative_to(CONFIG.stub_path / src_path)
+                target.parent.mkdir(parents=True, exist_ok=True)
+                target.write_bytes(item.read_bytes())
+
     def create_readme(self) -> None:
         """
         Create a readme file for the package
@@ -444,7 +475,8 @@ class StubPackage:
         _pyproject = self.pyproject
         assert _pyproject is not None, "No pyproject.toml file found"
         _pyproject["tool"]["poetry"]["packages"] = [
-            {"include": p.relative_to(self.package_path).as_posix()} for p in sorted((self.package_path).rglob("*.pyi"))
+            {"include": p.relative_to(self.package_path).as_posix()}
+            for p in sorted((self.package_path).rglob("*.pyi"))
         ]
         # write out the pyproject.toml file
         self.pyproject = _pyproject
@@ -631,7 +663,9 @@ class StubPackage:
         # check if the sources exist
         ok = self.are_package_sources_available()
         if not ok:
-            log.debug(f"{self.package_name}: skipping as one or more source stub folders are missing")
+            log.debug(
+                f"{self.package_name}: skipping as one or more source stub folders are missing"
+            )
             self.status["error"] = "Skipped, stub folder(s) missing"
             shutil.rmtree(self.package_path.as_posix())
             self._publish = False  # type: ignore
@@ -650,7 +684,9 @@ class StubPackage:
         self,
         production: bool,  # PyPI or Test-PyPi - USED TO FIND THE NEXT VERSION NUMBER
         force=False,  # BUILD even if no changes
-    ) -> bool:  # sourcery skip: default-mutable-arg, extract-duplicate-method, require-parameter-annotation
+    ) -> (
+        bool
+    ):  # sourcery skip: default-mutable-arg, extract-duplicate-method, require-parameter-annotation
         """
         Build a package
         look up the previous package version in the dabase
@@ -681,7 +717,9 @@ class StubPackage:
             self.pkg_version = self.update_pkg_version(production)
             self.status["version"] = self.pkg_version
             # to get the next version
-            log.debug(f"{self.package_name}: bump version for {old_ver} to {self.pkg_version } {'production' if production else 'test'}")
+            log.debug(
+                f"{self.package_name}: bump version for {old_ver} to {self.pkg_version } {'production' if production else 'test'}"
+            )
             self.write_package_json()
             log.trace(f"New hash: {self.package_name} {self.pkg_version} {self.hash}")
             if self.poetry_build():
@@ -734,20 +772,26 @@ class StubPackage:
         # Publish the package to PyPi, Test-PyPi or Github
         if self.is_changed() or force:
             if self.mpy_version == "latest":
-                log.warning("version: `latest` package will only be available on Github, and not published to PyPi.")
+                log.warning(
+                    "version: `latest` package will only be available on Github, and not published to PyPi."
+                )
                 self.status["result"] = "Published to GitHub"
             else:
                 self.update_hashes()  # resets is_changed to False
                 if not dry_run:
                     pub_ok = self.poetry_publish(production=production)
                 else:
-                    log.warning(f"{self.package_name}: Dry run, not publishing to {'' if production else 'Test-'}PyPi")
+                    log.warning(
+                        f"{self.package_name}: Dry run, not publishing to {'' if production else 'Test-'}PyPi"
+                    )
                     pub_ok = True
                 if not pub_ok:
                     log.warning(f"{self.package_name}: Publish failed for {self.pkg_version}")
                     self.status["error"] = "Publish failed"
                     return False
-                self.status["result"] = "Published to PyPi" if production else "Published to Test-PyPi"
+                self.status["result"] = (
+                    "Published to PyPi" if production else "Published to Test-PyPi"
+                )
                 self.update_hashes()
                 if dry_run:
                     log.warning(f"{self.package_name}: Dry run, not saving to database")

stubber/rst/lookup.py

@@ -22,7 +22,7 @@ __all__ = [
 
 # all possible Types needed for the stubs - exxess types should be removed later , and otherwise won't do much harm
 TYPING_IMPORT: List[str] = [
-    "from typing import IO, Any, Callable, Coroutine, Dict, Generator, Iterator, List, NoReturn, Optional, Tuple, Union, NamedTuple, TypeVar",
+    "from typing import IO, Any, Callable, Coroutine, Dict, Generator, Iterator, List, NoReturn, Optional, Tuple, Union, NamedTuple, TypeVar, Iterator",
     "from _typeshed import Incomplete",
 ]
 
@@ -158,7 +158,10 @@ LOOKUP_LIST = {
     "uio.open": ("IO", 0.95),  #  Open a file.
     "uos.listdir": ("List[Incomplete]", 0.95),
     "os.uname": ("uname_result", 0.95),
-    "ssl.ssl.wrap_socket": ("IO", 0.95),  # undocumented class ssl.SSLSocket #TODO: or wrapped-socket object ?
+    "ssl.ssl.wrap_socket": (
+        "IO",
+        0.95,
+    ),  # undocumented class ssl.SSLSocket #TODO: or wrapped-socket object ?
     "ussl.ussl.wrap_socket": ("IO", 0.95),  # undocumented class ssl.SSLSocket
     "usys.exit": ("NoReturn", 0.95),  # never returns
     "utime.sleep_ms": (
@@ -176,6 +179,8 @@ LOOKUP_LIST = {
     "_onewire.writebyte": ("None", 0.95),
     "_onewire.writebit": ("None", 0.95),
     "_onewire.crc8": ("int", 0.95),
+    # espnow
+    "espnow.ESPNow.recv": ("List", 0.95),  # list / ? tuple of bytestrings
 }
 
 
@@ -464,8 +469,6 @@ PARAM_FIXES = [
     ),
     # # This is a cleanup something that went wrong before
     # Fix("**kwargs: Optional[Any]","**kwargs")
-    # ------ ESPNow.rst uses   (ESP32 only) after the class / function prototype
-    Fix(r"\(ESP\d+\s+only\)", "", is_re=True),  # ESP32 / ESP8266 Only
     # os.mount - optional parameters
     # fsobj, mount_point, *, readonly)
     Fix(
@@ -473,7 +476,20 @@ PARAM_FIXES = [
         "fsobj, mount_point, *, readonly=False)",
     ),
     # micropython.const
-    Fix("expr)", "expr:Const_T)", name="const"),  # const: 3 - paired with return typing
+    Fix("expr)", "expr:Const_T)", name="const"),  # const: 3 - paired with return typing,
+    # ------ ESPNow.rst uses   (ESP32 only) after the class / function prototype
+    Fix(r"\(ESP\d+\s+only\)", "", is_re=True),  # ESP32 / ESP8266 Only
+    # espnow.ESPNow.send is missing several params
+    Fix(
+        "msg)",
+        "peer, msg,mac=None,sync=True)",
+        name="ESPNow.send",
+    ),
+    Fix(
+        "msg)",
+        "peer, msg,mac=None,sync=True)",
+        name="ESPNow.asend",
+    ),
 ]
 
 # List of classes and their parent classes that should be added to the class definition
@@ -508,6 +524,7 @@ CHILD_PARENT_CLASS = {
     "namedtuple": "tuple",
     "deque": "stdlib_deque",
     # ESPNow
+    "ESPNow": "ESPNowBase,Iterator",
     "AIOESPNow": "ESPNow",
 }
 

stubber/rst/output_dict.py

@@ -79,10 +79,11 @@ class SourceDict(OrderedDict):
                 out += str(code)
         return out
 
-    def __add__(self, dict: SourceDict):
+    def __add__(self, other: SourceDict):
+        "Aallows instances of the SourceDict class to be added together using the + operator or the += operator."
         # sd = sd + function
         # sd += function
-        self.update({dict.name: dict})
+        self.update({other.name: other})
         return self
 
     def add_docstr(self, docstr: Union[str, List[str]], extra: int = 0):
@@ -227,7 +228,15 @@ class SourceDict(OrderedDict):
 
 class ModuleSourceDict(SourceDict):
     def __init__(self, name: str, indent=0, lf: str = "\n"):
-        "set correct order a module definition to allow adding class variables"
+        """The ModuleSourceDict class is used to represent a Python module as a dictionary of its components, 
+        such as its docstring, version, comments, imports, constants, classes, and functions. 
+        The class has several methods,  
+            sort() which sorts the components of the module in the correct order for a module definition to allow adding class variables, 
+            find() which finds a class node based on its name, 
+            classes() which returns a list of the class names in parent-child order, 
+            add_import() which adds a list of imports to the module. 
+        The __str__() method is also defined to return a string representation of the module.
+        """
         super().__init__(
             [
                 ("docstr", [EMPTY_DOCSTR]),

stubber/rst/reader.py

@@ -782,7 +782,7 @@ class RSTWriter(RSTParser):
         return super().write_file(filename)
 
     def prepare_output(self):
-        "clean up some trailing spaces and commas"
+        "Remove trailing spaces and commas from the output."
         lines = str(self.output_dict).splitlines(keepends=True)
         self.output = lines
         for i in range(len(self.output)):

stubber/utils/config.py

@@ -16,7 +16,9 @@ class StubberConfig(Config):
     stub_path = key(key_name="stub-path", cast=Path, required=False, default=Path("./stubs"))
     "a Path to the stubs directory"
     # relative to stubs folder
-    fallback_path = key(key_name="fallback-path", cast=Path, required=False, default=Path("typings/fallback"))
+    fallback_path = key(
+        key_name="fallback-path", cast=Path, required=False, default=Path("typings/fallback")
+    )
     "a Path to the fallback stubs directory"
 
     # ------------------------------------------------------------------------------------------
@@ -27,23 +29,40 @@ class StubberConfig(Config):
     mpy_path = key(key_name="mpy-path", cast=Path, required=False, default=Path("micropython"))
     "a Path to the micropython folder in the repos directory"
 
-    mpy_lib_path = key(key_name="mpy-lib-path", cast=Path, required=False, default=Path("micropython-lib"))
+    mpy_lib_path = key(
+        key_name="mpy-lib-path", cast=Path, required=False, default=Path("micropython-lib")
+    )
     "a Path to the micropython-lib folder in the repos directory"
 
     # mpy_stubs_repo_path = key(key_name="mpy-stubs-repo-path", cast=Path, required=False, default=Path("./micropython-stubs"))
     # "a Path to the micropython-stubs folder in the repos directory"
 
-    publish_path = key(key_name="publish-path", cast=Path, required=False, default=Path("./repos/micropython-stubs/publish"))
+    publish_path = key(
+        key_name="publish-path",
+        cast=Path,
+        required=False,
+        default=Path("./repos/micropython-stubs/publish"),
+    )
     "a Path to the folder where all stub publication artefacts are stored"
 
-    template_path = key(key_name="template-path", cast=Path, required=False, default=Path("./repos/micropython-stubs/publish/template"))
+    template_path = key(
+        key_name="template-path",
+        cast=Path,
+        required=False,
+        default=Path("./repos/micropython-stubs/publish/template"),
+    )
     "a Path to the publication folder that has the template files"
 
     stable_version = key(key_name="stable-version", cast=str, required=False, default="1.20.0")
 
     "last published stable"
 
-    all_versions = key(key_name="all-versions", cast=list, required=False, default=["1.17", "1.18", "1.19", "1.19.1", "1.20.0"])
+    all_versions = key(
+        key_name="all-versions",
+        cast=list,
+        required=False,
+        default=["1.17", "1.18", "1.19", "1.19.1", "1.20.0"],
+    )
     "list of recent versions"
 
     BLOCKED_PORTS = ["minimal", "bare-arm"]
@@ -74,9 +93,11 @@ class StubberConfig(Config):
             all_versions = git.get_tags("micropython/micropython", minver="v1.17")
         except Exception as e:
             log.warning(f"Could not read micropython versions from git: {e}")
-            all_versions = ["1.17", "1.18", "1.19", "1.19.1", "1.20.0"]
+            all_versions = ["1.19", "1.19.1", "1.20.0", "1.21.0"]
         config_updates.update(all_versions=all_versions)
-        config_updates.update(stable_version=all_versions[-1])
+        config_updates.update(
+            stable_version=[v for v in all_versions if not v.endswith("preview")][-1]
+        )  # second last version - last version is the preview version
         return config_updates
 
 
@@ -98,7 +119,9 @@ def readconfig(filename: str = "pyproject.toml", prefix: str = "tool.", must_exi
     # add provider sources to the config
     config.add_source(EnvironmentConfigSource())
     if use_toml:
-        config.add_source(TomlConfigSource(filename, prefix=prefix, must_exist=must_exist))  # ,"tools.micropython-stubber"))
+        config.add_source(
+            TomlConfigSource(filename, prefix=prefix, must_exist=must_exist)
+        )  # ,"tools.micropython-stubber"))
     config.read()
     return config