micropython-stubber 1.20.6__py3-none-any.whl → 1.23.0__py3-none-any.whl

{micropython_stubber-1.20.6.dist-info → micropython_stubber-1.23.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.20.6
+Version: 1.23.0
 Summary: Tooling to create and maintain stubs for MicroPython
 Home-page: https://github.com/Josverl/micropython-stubber#readme
 License: MIT

{micropython_stubber-1.20.6.dist-info → micropython_stubber-1.23.0.dist-info}/RECORD

@@ -8,26 +8,26 @@ mpflash/mpflash/bootloader/manual.py,sha256=tebIE2YBYvsWx2YmAcUcWnTnSjCqR1AwkXKV
 mpflash/mpflash/bootloader/micropython.py,sha256=of9OuCchiGoczXPi6i0NT9LZHB9FgvigtZxWWvAcb2Q,399
 mpflash/mpflash/bootloader/touch1200.py,sha256=D9yB1n2bSR-nyQDdQXJtCsNknSfHhI6hRziBqOv_HJI,1466
 mpflash/mpflash/cli_download.py,sha256=qKZzHmuHazw5fhj_EGDu4DsqYCan41BK99nk1YWELFE,3527
-mpflash/mpflash/cli_flash.py,sha256=9udC74150-T96duaJzBUyzmxVANJBFCcVzLIpvfaDgk,7135
+mpflash/mpflash/cli_flash.py,sha256=IQfloZM1UK4VO4bo-8OxQkwH-RTGUFs7IWb-m4gFJJg,7136
 mpflash/mpflash/cli_group.py,sha256=s180-nyUVNEwA5bPlkIum4mZPEW0Udf6oBAElnrjsvQ,2236
 mpflash/mpflash/cli_list.py,sha256=AvYq5_Z7l0Z4rkbr23TwFNzstuZsQgopFpdcrTLwUvs,1965
-mpflash/mpflash/cli_main.py,sha256=nFe30fOZZoz4zl3VkLUNoGv478etVtEEN-ccBmok9Tk,1093
+mpflash/mpflash/cli_main.py,sha256=mOkwtRAxiyZsgiG1QVQ71OaO4kL0D0REEkh-VMieC8E,1107
 mpflash/mpflash/common.py,sha256=ZfJR8dKKUy4VDZUgnDTILzuaem2o1Ix2haLxHQ47Z0o,5765
-mpflash/mpflash/config.py,sha256=PsP-VzZkFOYcxyI_FiNyvlRyTOeHteO8n4oMQnCHm_8,1119
+mpflash/mpflash/config.py,sha256=7-IL4R9oHeSh0jO-hppw8pDv990nEI31dwBzZFD50eY,1007
 mpflash/mpflash/connected.py,sha256=vzQ6heV7w5Mnu76nR2dr9FiQ7Ja1x1Q_k0TGgdV1lT8,2955
 mpflash/mpflash/download.py,sha256=EL17R88QO4TaiX-80GjjlEd6CNZ0vDOcWPuwewZ0_zs,13875
-mpflash/mpflash/downloaded.py,sha256=j662_mCvGqiLnSQv6RuKxuPQ2KTp7t8GOfRMXzKHh0A,4741
+mpflash/mpflash/downloaded.py,sha256=n2iSVv3pS6rZmUr5ry8tOh-jSCZJdI-g_QJG8N5R1As,4815
 mpflash/mpflash/errors.py,sha256=6lUhVtECY3syV2bBGKzegGH4pPKXhevvhYQZd74sy6o,238
-mpflash/mpflash/flash.py,sha256=C9lrtJBQnkVojJ-W6vnkR16S6zhPEwdRR7GEbYbnd1E,1875
+mpflash/mpflash/flash.py,sha256=aC1z4Jq8b8a8O6rCTX1gdGcO5yM1vGoWlZGIWgKuHro,2059
 mpflash/mpflash/flash_esp.py,sha256=j-VdSAKzNQZRVVO7oM9NcRAJWPDHsUianOien8rnYE8,2252
-mpflash/mpflash/flash_stm32.py,sha256=x80yyLSe29YuPMZ0KyykPWUr0_DiuVxDVttMM-0M3LQ,799
+mpflash/mpflash/flash_stm32.py,sha256=JNY1bL-VNlnaQ6AhY9drKj8EgwpGwty0WAH1JD-Ecfs,584
 mpflash/mpflash/flash_stm32_cube.py,sha256=TnLNqmJcdwRXWj_t0W4o-NmwBjd3z94qpjuyz77oP9o,3859
-mpflash/mpflash/flash_stm32_dfu.py,sha256=oag6eTnhmztKqskmEm7MAjXW_tS854ALvZqc4C2RXgY,2871
-mpflash/mpflash/flash_uf2.py,sha256=VxUruch2pz8JgIbrOylA6gBCyx9C3Z4hoPMPaRQNN4g,2396
+mpflash/mpflash/flash_stm32_dfu.py,sha256=GUJTU6bmxu4m9cK_wQKRCXPKSIf7F8BAxKMSDs59TwQ,2985
+mpflash/mpflash/flash_uf2.py,sha256=f9CwUaBwnmgO9q7I5-Psbd0cStxyeiu0XDcu_OHlmVc,2796
 mpflash/mpflash/flash_uf2_boardid.py,sha256=2s4K3QiKWK5HKFKWYsDV3hI8alfWSxEOMeurER3eZtM,408
-mpflash/mpflash/flash_uf2_linux.py,sha256=Aj9qTEvZvJK-RBccvTBHMRwydMl29D6ynuBHHJXdfa4,3932
-mpflash/mpflash/flash_uf2_macos.py,sha256=4O-7S96vxnjRB2R3IwwA8ZsD-L_IPh0Mmb-949vi9bQ,953
-mpflash/mpflash/flash_uf2_windows.py,sha256=2K7R2uhfsdgFFmWAqFATQCljPQmBW56lsbDsHyk27J0,991
+mpflash/mpflash/flash_uf2_linux.py,sha256=I6KYbLrnn6lFvzoG-LFETak86VHuMG3XKpdrjCGH2co,3945
+mpflash/mpflash/flash_uf2_macos.py,sha256=HqQ2HjXlTYzCC5DzjNaoCOR4QKKi5UzjqJcfZVJLaKM,998
+mpflash/mpflash/flash_uf2_windows.py,sha256=Pg2siQENEqLddM7KKl9PdXtP7HzBsPICxo8uVCgn57E,1050
 mpflash/mpflash/list.py,sha256=pSV9WJozObPSnW-oYs2JPdmh2PtCPJUNgvrozclpnU4,2874
 mpflash/mpflash/logger.py,sha256=BAVrSXMGZLfSDRFbtVBtvb7Rl0sTJxooCgBS5t-6bXo,1057
 mpflash/mpflash/mpboard_id/__init__.py,sha256=yeSWAP1YJWYWB2i8KZlBK1l8loJRcDo-xdymuCv92nU,3723
@@ -36,7 +36,7 @@ mpflash/mpflash/mpboard_id/board.py,sha256=yQ8IDHQS09AelvTvmPhpmsL4oX3L7IXGqHork
 mpflash/mpflash/mpboard_id/board_id.py,sha256=G5s-kMKAD-LGUAuU5eYnq25-MGIQPyB-zJojjcGawa4,2878
 mpflash/mpflash/mpboard_id/board_info.zip,sha256=F6YowS96DAqjten4ySe4MXgZwPtE-saZOUfY5OQkqKk,19759
 mpflash/mpflash/mpboard_id/store.py,sha256=lQQgHSxcaM_ZURcfZNSUv3-ZJjUKMC_xEOOSdpzVvBU,1493
-mpflash/mpflash/mpremoteboard/__init__.py,sha256=b4XMG8YU5exQK3cFQy2EPsnycvP63YpgbeMdW64MXZ4,7462
+mpflash/mpflash/mpremoteboard/__init__.py,sha256=j-Cex6TlihDp125gjGB01S_zE9nIq4mdRfamWjnOJoA,7549
 mpflash/mpflash/mpremoteboard/mpy_fw_info.py,sha256=BTupe4rZDTs3UHRqvs429XqWHCchSpwa05yACOiOt5U,4413
 mpflash/mpflash/mpremoteboard/runner.py,sha256=YUmo5Y0aOgMaww8CXSdNdgXD-wRKncILuMZ0OB_2qRU,4646
 mpflash/mpflash/uf2disk.py,sha256=dQ8_U6e3qkFOyfXZDpWAsvEBIlMr-ZzLkzTDD8SADqM,286
@@ -46,26 +46,26 @@ mpflash/mpflash/vendor/dfu.py,sha256=jGsiD3lbSV1Ar9qJubhoY_hy-L8FI-K55aow8vgwoYQ
 mpflash/mpflash/vendor/pydfu.py,sha256=1ObubGsPFrQ7T9M3JRlIPNIG2xx8uYffaEe0Y6bdf_g,19937
 mpflash/mpflash/vendor/readme.md,sha256=ZVg7kuUYyXcWcrWkaSJ0CunwebCqu2SiS2sqDadwrT8,84
 mpflash/mpflash/vendor/versions.py,sha256=osv5yFyg47_BZ85k3LRrzjyPu6T4psx56rgBN3YXMyM,3885
-mpflash/mpflash/worklist.py,sha256=WtVcofHXeJEZZ3sucGh9vi2CeY8brpRKbhz6N3hqmgo,5792
-mpflash/poetry.lock,sha256=gxYwn52qLpMBy571ewPzeF4rvOnLzaCQZ2zvRhA7-dU,117989
-mpflash/pyproject.toml,sha256=AEKGF6Bv7MFjKFdELYoOaYthneX4ARDUioar5A_WJF0,1591
+mpflash/mpflash/worklist.py,sha256=j64PVJXm8jhLzPUQt3rnJXCbT1JEczTax46mRWID9bM,5809
+mpflash/poetry.lock,sha256=XBX2OYxy1q5tBn9pzXQBErgOwssrx_tVhUl8p2DZwMw,117989
+mpflash/pyproject.toml,sha256=sGxeBSd8LOo3l5DBlLypNW0B2kQLu-LpmdPG4ZI1lZw,1669
 mpflash/stm32_udev_rules.md,sha256=LJelvFFA8w9mBcEUDA02SZ4yzNKfUFL_NWLNUb6geWY,2622
-stubber/__init__.py,sha256=6iAf7REDZo8COEqYZ36DsEwpMsN3U8Ev0gLoPo6VEwU,46
+stubber/__init__.py,sha256=xZBZxZVT_tkoW2-USEDpT7Ru9I5ySVZ0FERKX_Puvk0,46
 stubber/basicgit.py,sha256=CkS4YrAP1pLwfoihUZB5Y39uQjkQu_n4ukyrvbrlExs,9440
 stubber/board/board_info.csv,sha256=3BBwHOtKfq_U0Xl8iWgNsN3akhbNMjb-TIeusDwtTXQ,8434
 stubber/board/boot.py,sha256=TEBSaKXY_TYJy9YrTRWv22m8jZRefaRNiwM8xNAlH5M,1086
-stubber/board/createstubs.py,sha256=7AxKv4qVCU4lGkMf97Je_-f0mi-LCaw_veqmq4M5B8k,31936
-stubber/board/createstubs_db.py,sha256=rOcUDj8mq7sCzm5aPhXvAa0jkANmAmxD5Od5IU4sfCA,29558
-stubber/board/createstubs_db_min.py,sha256=FJmKLWduxWEljchZoQ3OTn_uVV5hSzGNQSsYWk62e-A,11142
-stubber/board/createstubs_db_mpy.mpy,sha256=bsSpyY6Vt0Lz_KUrIUkmotUuJwPIDWgOEc5-6sXmbC4,9536
+stubber/board/createstubs.py,sha256=ZgpiFhmDl9LrszoxqOG1SI22bpvR9NWmYFwhvCCVLhY,31936
+stubber/board/createstubs_db.py,sha256=Gbi5LXqAorbFJ4qjb-jIAeBhE-niPr-_9scpNEXg-V8,29558
+stubber/board/createstubs_db_min.py,sha256=q4CA7qs8t3dj_whlNCUrw_yebdNb_9my85snqdbiuyE,11142
+stubber/board/createstubs_db_mpy.mpy,sha256=Uno7GVqRV6joDZ2UsITxv2y84Hjl75h_aqM1eRuK7MI,9536
 stubber/board/createstubs_lvgl.py,sha256=LDlY2AxT5S_IZ5twi2wK9gm3SnHsDt9inrpCLOYmZIk,26476
 stubber/board/createstubs_lvgl_min.py,sha256=9L9JsZUCY0E5x4F_Uyckkd8GjiB_49guU6DN-u7XhgU,26466
 stubber/board/createstubs_lvgl_mpy.mpy,sha256=ex-nlq2V5e8anQBJvRWEEc-FzU7nlwg5NSrZ8vOadIA,9267
-stubber/board/createstubs_mem.py,sha256=Q_zhrIHuPM44tmYBrmsIxVubq3AMo-I5_aMItfjZVgY,27953
-stubber/board/createstubs_mem_min.py,sha256=PosLj1D2mpoCm-KHhPJOIWqXlmpSf3ooFosz_v9GWFY,10713
-stubber/board/createstubs_mem_mpy.mpy,sha256=2UrnFQ2Rvs392k8eGXoP56q1sxYf20quKYvVHaHefe0,9118
-stubber/board/createstubs_min.py,sha256=L4he4S-NQt8Z7UbS6cykt76opAJdgz15wW1sepBqqUM,13405
-stubber/board/createstubs_mpy.mpy,sha256=XzBpYMh6v6QZw_675VDLnBJxx6szI-pRRasbUtHtM-k,12388
+stubber/board/createstubs_mem.py,sha256=B23Xon0wm5K8hoTZWHx6j551Jqfg-zDR70_ckiEvc74,27953
+stubber/board/createstubs_mem_min.py,sha256=EBMI05I-3D7f-6y6DQo5n2VfOkppKEqoJtt0huwo8v8,10713
+stubber/board/createstubs_mem_mpy.mpy,sha256=cNPvlft3SH_R3Epl5Tg3zDLnlG4-YAl6neUO1wfEM34,9118
+stubber/board/createstubs_min.py,sha256=mEo9F0ttyOeuhZ2bEeh4BKta4-yWfhbr20gATcaQx5g,13405
+stubber/board/createstubs_mpy.mpy,sha256=eNos3gzTHQTGN_TyB2IshtTWt6iLo98hGAfaBLIBgoI,12388
 stubber/board/fw_info.py,sha256=BTupe4rZDTs3UHRqvs429XqWHCchSpwa05yACOiOt5U,4413
 stubber/board/info.py,sha256=0FCQZ5J3KFDbYe0D5iOuwhmZUUBVASPU7-L6fA7ZRGc,5446
 stubber/board/main.py,sha256=l-5RCT-MMV93SkVwXh3guzx_kxFIJciSEgH1e4UrqT8,394
@@ -85,20 +85,20 @@ stubber/codemod/merge_docstub.py,sha256=-F2P9UAD98Xt8ArsNqQJ-AM6bz9H9V9E3S2d17Jk
 stubber/codemod/modify_list.py,sha256=_YTj3E44dwb7QaRqKaIq0IWg-BzH69AZRqTr3QMkFnY,2064
 stubber/codemod/utils.py,sha256=mE4Ks7-lqnxXbjQcftO_OkJGJDZyCOR4soNJSWRtMek,2402
 stubber/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stubber/commands/build_cmd.py,sha256=nH7rBmeLpyOLUmUDJVich1blH8TTb1yvJN4Xrzu-UDw,2367
-stubber/commands/cli.py,sha256=4CRoeLfE3JKykdoBhdciBebJBvuvqo_NTGSQ0A0_-kg,1799
-stubber/commands/clone_cmd.py,sha256=xLzr0Vcswpb3Lo-b46hLBluJKxhV5bsJKlxqa3TnGNM,2607
+stubber/commands/build_cmd.py,sha256=lZfbxPyduDkLDTCGWI_nBc_3lKwZjfWPvq4nVy2v944,2381
+stubber/commands/cli.py,sha256=LXeSG8-EeEb0PvlKkaRS5bscgtUsDTBLfQnqS0O6M24,1836
+stubber/commands/clone_cmd.py,sha256=D8rKyiuIvGDrxCgkjmiN60RzedMTLToHoRZnKc31Yh4,2663
 stubber/commands/config_cmd.py,sha256=CMFe0IngKPJYrb3kcZ6BObBOh4dW_0Wf7etAuJthB18,964
-stubber/commands/enrich_folder_cmd.py,sha256=f7UpS9IGjyCVu8LVtSSvkw3BgK0qzsQQyAhXDZ6X5Iw,1783
-stubber/commands/get_core_cmd.py,sha256=gsRKc_7OW8Wl9EXqyhrFzu7MqsDy2Ca8Zv2nNyf4eEc,2208
-stubber/commands/get_docstubs_cmd.py,sha256=O891GWA1CqYg6tHVBWOOmEELUcn6Z_NMaMDNibcimgg,2914
-stubber/commands/get_frozen_cmd.py,sha256=s7HnV8xT6AMjcJXThgFFV72u1V-gs6U5n2qdSvBcfZs,3829
-stubber/commands/get_mcu_cmd.py,sha256=xO38GuHqzNJIrg3rawN4ajmyv3DCk4au8d3PFg2o7bY,1959
-stubber/commands/merge_cmd.py,sha256=xAye4pibQfvnWBG8TegoDLGGngo6wMxJ1Z4bH7RpFTs,1607
-stubber/commands/publish_cmd.py,sha256=26PkYALwO7YyWD4JHIi30t24QzrtCf5XcA8ljlOJLSk,2791
-stubber/commands/stub_cmd.py,sha256=aObVfSiZq9jRJYYrtbiF44GoFNW8glNHvTjMK3gOz0U,1156
-stubber/commands/switch_cmd.py,sha256=IYzhsl_KO05LP7GUhPjUUgmyWsPmZGnbHb1DErX7ZKM,1762
-stubber/commands/variants_cmd.py,sha256=DTFjZ1MkawhJ_7bGfnMZfy9y_ZAKDFzIuphGcuiYW58,1236
+stubber/commands/enrich_folder_cmd.py,sha256=ysdd_CLdPCiEja4xuFOAX_a89telX4Da7cvkrpXP4lY,1798
+stubber/commands/get_core_cmd.py,sha256=VwkZl9g81LvwWu4grrIb2Qo8M5-yXrDEX5mUWJ2uKFo,2240
+stubber/commands/get_docstubs_cmd.py,sha256=93rWWKBKmt7D9UD0-c4mtVAH5hw5Z3PnWDpiKVfrWe8,2935
+stubber/commands/get_frozen_cmd.py,sha256=I9Hde0n-k5e9LHrjaUp0d5WeaamntLjtEOJQ7GCLHgc,3857
+stubber/commands/get_mcu_cmd.py,sha256=BzsOo1C046sRjYtS_9MM-epXF9UaElf1j23LM4aqpnI,2016
+stubber/commands/merge_cmd.py,sha256=VxpYGaF7JduBr43POFviT15ZecbOW1o4vqTaKMCN0jU,1622
+stubber/commands/publish_cmd.py,sha256=EiOYXVXyMru2lL6EOy7NSwHAS7TZXfehjvfY5r8gH3Y,2805
+stubber/commands/stub_cmd.py,sha256=PzvCppuhY2vRJJEzKbdc87WnrVEd3jPJ7AdtQeUSpn8,1171
+stubber/commands/switch_cmd.py,sha256=Aa4Q8LEc-mbHfO6h9orkIuR8wr9yOY-_bwL4HMPiWJ8,1825
+stubber/commands/variants_cmd.py,sha256=IYDmR3JyPPQ8uSZURLWbCluCV85_S38F_JKZTzRE-Lg,1251
 stubber/cst_transformer.py,sha256=Er9kww4hgdeQ9dARMx8lB5PLIvPaKjtKJMe8BofKOzY,6301
 stubber/data/board_info.csv,sha256=3BBwHOtKfq_U0Xl8iWgNsN3akhbNMjb-TIeusDwtTXQ,8434
 stubber/data/board_info.json,sha256=LbyNo3qeij8bY_PRTxWoS5nFuDv6VyaRTKGiXC_-zRQ,57210
@@ -138,8 +138,8 @@ stubber/rst/rst_utils.py,sha256=8wfodql00CnO57x8VeNh1yoz7yx_ONa330kWuR1JFoE,1727
 stubber/stubber.py,sha256=sScRIAq7vvUZUS9Mzh4Ne6ny0qpsReGNqo0u8vtZXEc,1596
 stubber/stubs_from_docs.py,sha256=jcNdbNFQ6qZiVOVzdD8nfBNTubD-jviL_KJDPqOfTxo,2743
 stubber/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stubber/tools/manifestfile.py,sha256=OzDIryJgZEZ-kutskbxogPJY13wpsnDscOFPkzNZbH0,23111
-stubber/tools/readme.md,sha256=VLcozbfszPiMbYe1bHhh-FXtEZ263TbeLSdSCwdTe5o,194
+stubber/tools/manifestfile.py,sha256=hfv_bTDytZDSndKy2GuPScH9xz_YzihDY0QmrOY9RLQ,25094
+stubber/tools/readme.md,sha256=NJ_g0oeeExhiRs2lMQVekccnR_c2lGLt-snu1RnUIx0,278
 stubber/update_fallback.py,sha256=Wi0dj5dly1UFmjpzh7dksb-RuHsSRC0i-E9H-dZ5AQo,4804
 stubber/update_module_list.py,sha256=smeu-xSeFgtr1piJNR1JqLzHd3HZ1K5_iaKNRea6dzk,3886
 stubber/utils/__init__.py,sha256=i2OXAFcw6X1xSEwh2X355lGrM0xgmZZow9z9zRwtV5A,220
@@ -152,8 +152,8 @@ stubber/utils/stubmaker.py,sha256=1eMNpZZ-BWBtxLwBO-kz4CywjUe0JexN6QSyAVNICxM,50
 stubber/utils/typed_config_toml.py,sha256=6nlFgHwdCcK_0MJICsstCFgm9M6TblvF-l0_2cpw_cY,2552
 stubber/utils/versions.py,sha256=56UhB49F2647jY9eWtkjjRuYYfJLEjC9daQFhgckgZM,4161
 stubber/variants.py,sha256=iS3sv8cT7czdI9x4KqzTCPT6hX1CKQ-bIlWnDG6gyoU,3688
-micropython_stubber-1.20.6.dist-info/LICENSE,sha256=2zsOXlYgl9W7_XGXcncAXIYfvSVlyNcVBycC6hhlKhA,1542
-micropython_stubber-1.20.6.dist-info/METADATA,sha256=4r0sxERw7TcA4axNn-IUzxWIl6sc-upxa7iU5Mf-j_A,19158
-micropython_stubber-1.20.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-micropython_stubber-1.20.6.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
-micropython_stubber-1.20.6.dist-info/RECORD,,
+micropython_stubber-1.23.0.dist-info/LICENSE,sha256=2zsOXlYgl9W7_XGXcncAXIYfvSVlyNcVBycC6hhlKhA,1542
+micropython_stubber-1.23.0.dist-info/METADATA,sha256=Km0C0eRnH4G_oYL9jOJekeNyKSDPbVfQr4rLmJm28OA,19158
+micropython_stubber-1.23.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+micropython_stubber-1.23.0.dist-info/entry_points.txt,sha256=NQi_M36fgq5k6giSuASas3LrpF6CVdkzfvJC0ja73_g,55
+micropython_stubber-1.23.0.dist-info/RECORD,,

mpflash/mpflash/cli_flash.py

@@ -103,7 +103,7 @@ from .worklist import (WorkList, full_auto_worklist, manual_worklist,
 )
 @click.option(
     "--bootloader",
-    "-b",
+    "-bl",
     "bootloader",
     type=click.Choice([e.value for e in BootloaderMethod]),
     default="mpy",

mpflash/mpflash/cli_main.py

@@ -4,7 +4,7 @@
 
 import os
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 from .cli_download import cli_download

mpflash/mpflash/config.py

@@ -4,18 +4,15 @@ import os
 from pathlib import Path
 from typing import List
 
-import pkg_resources
 import platformdirs
+from importlib.metadata import version
 
 from mpflash.logger import log
 
 
 def get_version():
     name = __package__ or "mpflash"
-    try:
-        return pkg_resources.get_distribution(name).version
-    except pkg_resources.DistributionNotFound:
-        return "Package not found"
+    return version(name)
 
 
 class MPtoolConfig:
@@ -32,16 +29,15 @@ class MPtoolConfig:
     @property
     def interactive(self):
         # No interactions in CI
-        if os.getenv('GITHUB_ACTIONS') == 'true':
+        if os.getenv("GITHUB_ACTIONS") == "true":
             log.warning("Disabling interactive mode in CI")
             return False
         return self._interactive
-    
+
     @interactive.setter
-    def interactive(self, value:bool):
+    def interactive(self, value: bool):
         self._interactive = value
 
 
-
 config = MPtoolConfig()
 __version__ = get_version()

mpflash/mpflash/downloaded.py

@@ -4,7 +4,7 @@ from typing import Dict, List, Optional
 import jsonlines
 from loguru import logger as log
 
-from mpflash.common import FWInfo
+from mpflash.common import PORT_FWTYPES, FWInfo
 from mpflash.vendor.versions import clean_version
 
 from .config import config
@@ -109,7 +109,7 @@ def filter_downloaded_fwlist(
     log.trace(f"Filtering firmware for {version} : {len(fw_list)} found.")
     # filter by port
     if port:
-        fw_list = [fw for fw in fw_list if fw.port == port]
+        fw_list = [fw for fw in fw_list if fw.port == port and Path(fw.firmware).suffix in PORT_FWTYPES[port]]
         log.trace(f"Filtering firmware for {port} : {len(fw_list)} found.")
 
     if board_id:
@@ -120,6 +120,7 @@ def filter_downloaded_fwlist(
             # the firmware variant should match exactly the board_id
             fw_list = [fw for fw in fw_list if fw.variant == board_id]
         log.trace(f"Filtering firmware for {board_id} : {len(fw_list)} found.")
+        
     if selector and port in selector:
         fw_list = [fw for fw in fw_list if fw.filename.endswith(selector[port])]
     return fw_list

mpflash/mpflash/flash.py

@@ -30,20 +30,23 @@ def flash_list(
             continue
         log.info(f"Updating {mcu.board} on {mcu.serialport} to {fw_info.version}")
         updated = None
-        # try:
-        if mcu.port in UF2_PORTS and fw_file.suffix == ".uf2":
-            if not enter_bootloader(mcu, bootloader):
-                continue
-            updated = flash_uf2(mcu, fw_file=fw_file, erase=erase)
-        elif mcu.port in ["stm32"]:
-            if not enter_bootloader(mcu, bootloader):
-                continue
-            updated = flash_stm32(mcu, fw_file, erase=erase)
-        elif mcu.port in ["esp32", "esp8266"]:
-            #  bootloader is handled by esptool for esp32/esp8266
-            updated = flash_esp(mcu, fw_file=fw_file, erase=erase)
-        else:
-            log.error(f"Don't (yet) know how to flash {mcu.port}-{mcu.board} on {mcu.serialport}")
+        try:
+            if mcu.port in UF2_PORTS and fw_file.suffix == ".uf2":
+                if not enter_bootloader(mcu, bootloader):
+                    continue
+                updated = flash_uf2(mcu, fw_file=fw_file, erase=erase)
+            elif mcu.port in ["stm32"]:
+                if not enter_bootloader(mcu, bootloader):
+                    continue
+                updated = flash_stm32(mcu, fw_file, erase=erase)
+            elif mcu.port in ["esp32", "esp8266"]:
+                #  bootloader is handled by esptool for esp32/esp8266
+                updated = flash_esp(mcu, fw_file=fw_file, erase=erase)
+            else:
+                log.error(f"Don't (yet) know how to flash {mcu.port}-{mcu.board} on {mcu.serialport}")
+        except Exception as e:
+            log.error(f"Failed to flash {mcu.board} on {mcu.serialport}")
+            log.exception(e)
 
         if updated:
             flashed.append(updated)

mpflash/mpflash/flash_stm32.py

@@ -1,4 +1,4 @@
-"""Flash STM32 boards using either STM32CubeProgrammer CLI or dfu-util"""
+"""Flash STM32 boards using pydfu"""
 
 from pathlib import Path
 
@@ -11,14 +11,8 @@ from mpflash.mpremoteboard import MPRemoteBoard
 
 def flash_stm32(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool, stm32_dfu: bool = True):
     # sourcery skip: lift-return-into-if
-    log.info("Using dfu-util")
     dfu_init()
-    updated = flash_stm32_dfu(mcu, fw_file=fw_file, erase=erase)
-    # if stm32_dfu:
-    # else:
-    #     log.info("Using STM32CubeProgrammer CLI")
-    #     updated = flash_stm32_cubecli(mcu, fw_file=fw_file, erase=erase)
-
-    mcu.wait_for_restart()
-    log.success(f"Flashed {mcu.version} to {mcu.board}")
+    if updated := flash_stm32_dfu(mcu, fw_file=fw_file, erase=erase):
+        mcu.wait_for_restart()
+        log.success(f"Flashed {mcu.version} to {mcu.board}")
     return updated

mpflash/mpflash/flash_stm32_dfu.py

@@ -39,6 +39,7 @@ def dfu_init():
         log.error("pydfu not found")
         return None
     if platform.system() == "Windows":
+        log.debug("Initializing libusb backend on Windows...")
         init_libusb_windows()
 
 
@@ -59,6 +60,8 @@ def flash_stm32_dfu(
     Returns:
         Optional[MPRemoteBoard]: The flashed remote board if successful, None otherwise.
     """
+    log.info("Using pydfu to flash STM32 boards")
+
     if not pydfu:
         log.error("pydfu not found, please install it with 'pip install pydfu' if supported")
         return None

mpflash/mpflash/flash_uf2.py

@@ -12,6 +12,8 @@ from loguru import logger as log
 from rich.progress import track
 
 from mpflash.mpremoteboard import MPRemoteBoard
+import tenacity
+from tenacity import stop_after_attempt, wait_fixed
 
 from .common import PORT_FWTYPES
 from .flash_uf2_boardid import get_board_id
@@ -37,31 +39,51 @@ def flash_uf2(mcu: MPRemoteBoard, fw_file: Path, erase: bool) -> Optional[MPRemo
         log.error(f"UF2 not supported on {mcu.board} on {mcu.serialport}")
         return None
     if erase:
-        log.info("Erasing not yet implemented for UF2 flashing.")
+        destination = waitfor_uf2()
 
+    if not destination or not destination.exists() or not (destination / "INFO_UF2.TXT").exists():
+        log.error("Board is not in bootloader mode")
+        return None
+
+    log.info("Board is in bootloader mode")
+    board_id = get_board_id(destination)  # type: ignore
+    log.info(f"Board ID: {board_id}")
+    try:
+        cp_firmware_to_uf2(fw_file, destination)
+        log.success("Done copying, resetting the board and wait for it to restart")
+    except tenacity.RetryError:
+        log.error("Failed to copy the firmware file to the board.")
+        return None
+
+    if sys.platform in ["linux"]:
+        dismount_uf2_linux()
+
+    mcu.wait_for_restart()
+    # time.sleep(1)  # 5 secs to short on linux
+    return mcu
+
+
+def waitfor_uf2():
+    """
+    Wait for the UF2 drive to mount
+    """
     if sys.platform == "linux":
-        destination = wait_for_UF2_linux()
+        return wait_for_UF2_linux()
     elif sys.platform == "win32":
-        destination = wait_for_UF2_windows()
+        return wait_for_UF2_windows()
     elif sys.platform == "darwin":
         log.warning(f"OS {sys.platform} not tested/supported")
-        destination = wait_for_UF2_macos()
+        return wait_for_UF2_macos()
     else:
         log.warning(f"OS {sys.platform} not tested/supported")
         return None
 
-    if not destination or not destination.exists() or not (destination / "INFO_UF2.TXT").exists():
-        log.error("Board is not in bootloader mode")
-        return None
 
-    log.info("Board is in bootloader mode")
-    board_id = get_board_id(destination)  # type: ignore
-    log.info(f"Board ID: {board_id}")
+@tenacity.retry(stop=stop_after_attempt(3), wait=wait_fixed(1), reraise=False)
+def cp_firmware_to_uf2(fw_file, destination):
+    """
+    Copy the firmware file to the destination,
+    Retry 3 times with 1s delay
+    """
     log.info(f"Copying {fw_file} to {destination}.")
     shutil.copy(fw_file, destination)
-    log.success("Done copying, resetting the board and wait for it to restart")
-    if sys.platform in ["linux"]:
-        dismount_uf2_linux()
-    for _ in track(range(5 + 2), description="Waiting for the board to restart", transient=True, refresh_per_second=2):
-        time.sleep(1)  # 5 secs to short on linux
-    return mcu

mpflash/mpflash/flash_uf2_linux.py

@@ -42,7 +42,10 @@ def get_uf2_drives():
             uf2.mountpoint = uf2_part["mountpoint"]
             yield uf2
         elif disk["type"] == "disk" and disk.get("children") and len(disk.get("children")) > 0:
-            if disk.get("children")[0]["type"] == "part" and disk.get("children")[0]["fstype"] == "vfat":
+            if (
+                disk.get("children")[0]["type"] == "part"
+                and disk.get("children")[0]["fstype"] == "vfat"
+            ):
                 uf2_part = disk.get("children")[0]
                 # print( json.dumps(uf2_part, indent=4))
                 uf2 = UF2Disk()
@@ -70,7 +73,7 @@ def pmount(disk: UF2Disk):
         log.debug(f"Mounted {disk.label} at {disk.mountpoint}")
         glb_dismount_me.append(disk)
     else:
-        log.debug(f"\n{disk.label} already mounted at {disk.mountpoint}")
+        log.trace(f"\n{disk.label} already mounted at {disk.mountpoint}")
 
 
 def pumount(disk: UF2Disk):
@@ -101,9 +104,12 @@ def wait_for_UF2_linux(s_max: int = 10):
     uf2_drives = []
     # while not destination and wait > 0:
     for _ in track(
-        range(s_max), description="Waiting for mcu to mount as a drive", transient=True, refresh_per_second=2
+        range(s_max),
+        description="Waiting for mcu to mount as a drive",
+        transient=True,
+        refresh_per_second=2,
+        total=s_max,
     ):
-        # log.info(f"Waiting for mcu to mount as a drive : {wait} seconds left")
         uf2_drives += list(get_uf2_drives())
         for drive in get_uf2_drives():
             pmount(drive)

mpflash/mpflash/flash_uf2_macos.py

@@ -10,14 +10,17 @@ from typing import Optional
 from rich.progress import track
 
 
-
 def wait_for_UF2_macos(s_max: int = 10) -> Optional[Path]:
     """Wait for the MCU to mount as a drive"""
     if s_max < 1:
         s_max = 10
     destination = None
     for _ in track(
-        range(s_max), description="Waiting for mcu to mount as a drive", transient=True, refresh_per_second=2
+        range(s_max),
+        description="Waiting for mcu to mount as a drive",
+        transient=True,
+        refresh_per_second=2,
+        total=s_max,
     ):
         # log.info(f"Waiting for mcu to mount as a drive : {n} seconds left")
         vol_mounts = Path("/Volumes").iterdir()

mpflash/mpflash/flash_uf2_windows.py

@@ -11,14 +11,18 @@ import psutil
 from rich.progress import track
 
 
-
-
 def wait_for_UF2_windows(s_max: int = 10) -> Optional[Path]:
     """Wait for the MCU to mount as a drive"""
     if s_max < 1:
         s_max = 10
     destination = None
-    for _ in track(range(s_max), description="Waiting for mcu to mount as a drive", transient=True,refresh_per_second=2):
+    for _ in track(
+        range(s_max),
+        description="Waiting for mcu to mount as a drive",
+        transient=True,
+        refresh_per_second=2,
+        total=s_max,
+    ):
         # log.info(f"Waiting for mcu to mount as a drive : {n} seconds left")
         drives = [drive.device for drive in psutil.disk_partitions()]
         for drive in drives:

mpflash/mpflash/mpremoteboard/__init__.py

@@ -91,7 +91,9 @@ class MPRemoteBoard:
 
         if sys.platform == "win32":
             # Windows sort of comports by number - but fallback to device name
-            return sorted(output, key=lambda x: int(x.split()[0][3:]) if x.split()[0][3:].isdigit() else x)
+            return sorted(
+                output, key=lambda x: int(x.split()[0][3:]) if x.split()[0][3:].isdigit() else x
+            )
         # sort by device name
         return sorted(output)
 
@@ -127,7 +129,9 @@ class MPRemoteBoard:
             self.description = descr = info["board"]
             pos = descr.rfind(" with")
             short_descr = descr[:pos].strip() if pos != -1 else ""
-            if board_name := find_board_id_by_description(descr, short_descr, version=self.version):
+            if board_name := find_board_id_by_description(
+                descr, short_descr, version=self.version
+            ):
                 self.board = board_name
             else:
                 self.board = "UNKNOWN_BOARD"
@@ -211,7 +215,8 @@ class MPRemoteBoard:
             transient=True,
             get_time=lambda: time.time(),
             show_speed=False,
-            refresh_per_second=1,
+            refresh_per_second=2,
+            total=timeout,
         ):
             time.sleep(1)
             try:

mpflash/mpflash/worklist.py

@@ -3,7 +3,7 @@ from typing import Dict, List, Optional, Tuple
 
 from loguru import logger as log
 
-from mpflash.common import FWInfo, filtered_comports
+from mpflash.common import FWInfo, filtered_comports, PORT_FWTYPES
 from mpflash.errors import MPFlashError
 
 from .downloaded import find_downloaded_firmware
@@ -54,8 +54,9 @@ def auto_update(
         if not board_firmwares:
             log.error(f"No {target_version} firmware found for {mcu.board} on {mcu.serialport}.")
             continue
+
         if len(board_firmwares) > 1:
-            log.debug(f"Multiple {target_version} firmwares found for {mcu.board} on {mcu.serialport}.")
+            log.warning(f"Multiple {target_version} firmwares found for {mcu.board} on {mcu.serialport}.")
 
         # just use the last firmware
         fw_info = board_firmwares[-1]

mpflash/poetry.lock

@@ -1585,4 +1585,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.8.1,<4.0"
-content-hash = "ec512f96331465adf386ce2606d8f8fdca4523a862ed61ce4487d103e84e0d43"
+content-hash = "99cc10bd15b033a47635e31676205b38443b15697fb189b01a8eb7f2f175acf8"

mpflash/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "0.8.7"
+version = "0.9.0"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
@@ -40,6 +40,10 @@ rich-click = "^1.8.1"
 tenacity = "8.2.3"
 
 
+[tool.poetry.group.dev]
+optional = true
+[tool.poetry.group.dev.dependencies]
+
 [tool.poetry.group.test]
 optional = true
 [tool.poetry.group.test.dependencies]

stubber/__init__.py

@@ -1,3 +1,3 @@
 """get the version"""
 
-__version__ = "1.20.6"
+__version__ = "1.23.0"

stubber/board/createstubs.py

@@ -24,7 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.20.6"
+__version__ = "v1.23.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -595,10 +595,10 @@ 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.6 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.23.0 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.20.6 do not have a micro .0
+            # versions from 1.10.0 to 1.23.0 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable

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.20.6
+This variant was generated from createstubs.py by micropython-stubber v1.23.0
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -43,7 +43,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.20.6"
+__version__ = "v1.23.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -606,10 +606,10 @@ 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.6 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.23.0 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.20.6 do not have a micro .0
+            # versions from 1.10.0 to 1.23.0 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable

stubber/board/createstubs_db_min.py

@@ -51,7 +51,7 @@ try:from machine import reset
 except O:pass
 try:from collections import OrderedDict as l
 except O:from ucollections import OrderedDict as l
-__version__='v1.20.6'
+__version__='v1.23.0'
 A3=2
 A4=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]

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.20.6
+This variant was generated from createstubs.py by micropython-stubber v1.23.0
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -34,7 +34,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.20.6"
+__version__ = "v1.23.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -597,10 +597,10 @@ 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.6 do not have a micro .0
+            and info["version"] >= "1.10.0"  # versions from 1.10.0 to 1.23.0 do not have a micro .0
             and info["version"] <= "1.19.9"
         ):
-            # versions from 1.10.0 to 1.20.6 do not have a micro .0
+            # versions from 1.10.0 to 1.23.0 do not have a micro .0
             info["version"] = info["version"][:-2]
 
     # spell-checker: disable

stubber/board/createstubs_mem_min.py

@@ -47,7 +47,7 @@ try:from machine import reset
 except N:pass
 try:from collections import OrderedDict as g
 except N:from ucollections import OrderedDict as g
-__version__='v1.20.6'
+__version__='v1.23.0'
 y=2
 z=2
 A0=['lib','/lib','/sd/lib','/flash/lib',J]

stubber/board/createstubs_min.py

@@ -50,7 +50,7 @@ try:from machine import reset
 except N:pass
 try:from collections import OrderedDict as h
 except N:from ucollections import OrderedDict as h
-__version__='v1.20.6'
+__version__='v1.23.0'
 A0=2
 A1=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]

stubber/commands/build_cmd.py

@@ -2,7 +2,7 @@
 
 from typing import List, Union
 
-import click
+import rich_click as click
 from loguru import logger as log
 from tabulate import tabulate
 

stubber/commands/cli.py

@@ -1,9 +1,10 @@
 """
 command line interface - main group
 """
+
 import sys
 
-import click
+import rich_click as click
 from loguru import logger as log
 from stubber import __version__
 
@@ -11,11 +12,12 @@ from stubber import __version__
 @click.group(chain=True)
 @click.version_option(package_name="micropython-stubber", prog_name="micropython-stubber✏️ ")
 @click.option(
+    "-V",
     "-v",
     "--verbose",
     count=True,
     default=0,
-    help="-v for DEBUG, -v -v for TRACE",
+    help="-V for DEBUG, -VV for TRACE",
     is_eager=True,
 )
 @click.pass_context
@@ -46,6 +48,8 @@ def set_loglevel(verbose: int) -> str:
     else:
         format_str = "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>"
 
-    log.add(sys.stderr, level=level, backtrace=True, diagnose=True, colorize=True, format=format_str)
+    log.add(
+        sys.stderr, level=level, backtrace=True, diagnose=True, colorize=True, format=format_str
+    )
     log.info(f"micropython-stubber {__version__}")
     return level

stubber/commands/clone_cmd.py

@@ -7,7 +7,7 @@ import os
 from pathlib import Path
 from typing import List, Tuple, Union
 
-import click
+import rich_click as click
 import stubber.basicgit as git
 from loguru import logger as log
 from stubber.utils.config import CONFIG
@@ -20,8 +20,19 @@ from .cli import stubber_cli
 
 
 @stubber_cli.command(name="clone")
-@click.option("--path", "-p", default=CONFIG.repo_path.as_posix(), type=click.Path(file_okay=False, dir_okay=True))
-@click.option("--add-stubs/--no-stubs", "stubs", default=False, is_flag=True, help="Also clone the micropython-stubs repo")
+@click.option(
+    "--path",
+    "-p",
+    default=CONFIG.repo_path.as_posix(),
+    type=click.Path(file_okay=False, dir_okay=True),
+)
+@click.option(
+    "--add-stubs/--no-stubs",
+    "stubs",
+    default=False,
+    is_flag=True,
+    help="Also clone the micropython-stubs repo",
+)
 def cli_clone(path: Union[str, Path], stubs: bool = False):
     """
     Clone/fetch the micropython repos locally.

stubber/commands/enrich_folder_cmd.py

@@ -1,10 +1,11 @@
 """
 enrich machinestubs with docstubs
 """
+
 from pathlib import Path
 from typing import Union
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 from stubber.codemod.enrich import enrich_folder

stubber/commands/get_core_cmd.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import List
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 import stubber.get_cpython as get_cpython
@@ -54,14 +54,16 @@ def cli_get_core(
     """
     # default parameter values
     stub_folder = stub_folder or CONFIG.stub_path.as_posix()
-    
+
     stub_paths: List[Path] = []
     for core_type in ["pycopy", "micropython"]:
         log.info(f"::group:: Get Cpython core :{core_type}")
         req_filename = f"requirements-core-{core_type}.txt"
         stub_path = Path(stub_folder) / f"cpython_core-{core_type}"
 
-        get_cpython.get_core(stub_path=stub_path.as_posix(), requirements=req_filename, family=core_type)
+        get_cpython.get_core(
+            stub_path=stub_path.as_posix(), requirements=req_filename, family=core_type
+        )
         stub_paths.append(stub_path)
 
     log.info("::group:: start post processing of retrieved stubs")

stubber/commands/get_docstubs_cmd.py

@@ -6,7 +6,7 @@ get-docstubs
 from pathlib import Path
 from typing import Optional
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 import stubber.basicgit as git
@@ -40,13 +40,15 @@ from .cli import stubber_cli
     show_default=True,
 )
 #  @click.option("--family", "-f", "basename", default="micropython", help="Micropython family.", show_default=True)
-@click.option("--version", "--tag", default="", type=str, help="Version number to use. [default: Git tag]")
+@click.option(
+    "--version", "--tag", default="", type=str, help="Version number to use. [default: Git tag]"
+)
 @click.option("--black/--no-black", "-b/-nb", default=True, help="Run black", show_default=True)
 @click.pass_context
 def cli_docstubs(
     ctx: click.Context,
     path: Optional[str] = None,
-    target:Optional[str] = None,
+    target: Optional[str] = None,
     black: bool = True,
     basename: Optional[str] = None,
     version: str = "",

stubber/commands/get_frozen_cmd.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 from typing import List, Optional
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 import stubber.utils as utils
@@ -85,7 +85,9 @@ def cli_get_frozen(
     version = utils.checkedout_version(CONFIG.mpy_path)
     log.info("MicroPython version : {}".format(version))
 
-    stub_path = freeze_any(version=version, mpy_path=CONFIG.mpy_path, mpy_lib_path=CONFIG.mpy_lib_path)
+    stub_path = freeze_any(
+        version=version, mpy_path=CONFIG.mpy_path, mpy_lib_path=CONFIG.mpy_lib_path
+    )
     stub_paths.append(stub_path)
     # Also enrich the frozen modules from the doc stubs if available
 

stubber/commands/get_mcu_cmd.py

@@ -5,7 +5,7 @@
 ##########################################################################################
 
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 from stubber.bulk.mcu_stubber import stub_connected_mcus
@@ -37,7 +37,10 @@ from .cli import stubber_cli
 )
 @click.option("--debug/--no-debug", default=False, show_default=True, help="Debug mode.")
 @click.option(
-    "--reset/--no-reset", default=False, show_default=True, help="Reset the board before running createstubs."
+    "--reset/--no-reset",
+    default=False,
+    show_default=True,
+    help="Reset the board before running createstubs.",
 )
 @click.option(
     "--github/--local",
@@ -50,7 +53,9 @@ def cli_create_mcu_stubs(variant: str, format: str, debug: bool, reset: bool, gi
     # check if all repos have been cloned
     for repo in CONFIG.repos:
         if not repo.exists():
-            log.error(f"Repo {repo} not found, use 'stubber clone --add-stubs' to clone the repos.")
+            log.error(
+                f"Repo {repo} not found, use 'stubber clone --add-stubs' to clone the repos."
+            )
             exit(1)
 
     exit(stub_connected_mcus(variant=variant, format=format, debug=debug))

stubber/commands/merge_cmd.py

@@ -1,9 +1,10 @@
 """
 enrich machinestubs with docstubs
 """
+
 from typing import List, Union
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 from stubber.publish.merge_docstubs import merge_all_docstubs

stubber/commands/publish_cmd.py

@@ -4,7 +4,7 @@ Commandline interface to publish stubs.
 
 from typing import List, Union
 
-import click
+import rich_click as click
 from loguru import logger as log
 from tabulate import tabulate
 

stubber/commands/stub_cmd.py

@@ -1,4 +1,5 @@
 """Create or update .pyi type hint files."""
+
 ##########################################################################################
 # stub
 ##########################################################################################
@@ -7,7 +8,7 @@ from loguru import logger as log
 from pathlib import Path
 from typing import Union
 
-import click
+import rich_click as click
 from stubber.utils import generate_pyi_files
 from stubber.utils.post import do_post_processing
 

stubber/commands/switch_cmd.py

@@ -2,11 +2,10 @@
 switch to a specific version of the micropython repos
 """
 
-
 from pathlib import Path
 from typing import Optional, Union
 
-import click
+import rich_click as click
 
 import stubber.basicgit as git
 from stubber.utils.config import CONFIG
@@ -23,7 +22,11 @@ from .cli import stubber_cli
 # get version list from Git tags in the repo that is provided on the command line
 
 try:
-    VERSION_LIST = git.get_tags("micropython/micropython", minver="v1.9.3") + [V_PREVIEW, "latest", "stable"]
+    VERSION_LIST = git.get_tags("micropython/micropython", minver="v1.9.3") + [
+        V_PREVIEW,
+        "latest",
+        "stable",
+    ]
 except Exception:
     # offline fallback
     VERSION_LIST = ["v1.91.1", "v1.20.1", "v1.21.0", "v1.22.1", "preview", "stable"]
@@ -31,7 +34,12 @@ except Exception:
 
 @stubber_cli.command(name="switch")
 @click.argument("tag", required=False, type=click.Choice(VERSION_LIST, case_sensitive=False))
-@click.option("--path", "-p", default=CONFIG.repo_path.as_posix(), type=click.Path(file_okay=False, dir_okay=True))
+@click.option(
+    "--path",
+    "-p",
+    default=CONFIG.repo_path.as_posix(),
+    type=click.Path(file_okay=False, dir_okay=True),
+)
 def cli_switch(path: Union[str, Path], tag: Optional[str] = None):
     """
     Switch to a specific version of the micropython repos.

stubber/commands/variants_cmd.py

@@ -1,7 +1,8 @@
 """Create all variant of createstubs*.py."""
+
 from pathlib import Path
 
-import click
+import rich_click as click
 from loguru import logger as log
 from stubber.utils.config import CONFIG
 from stubber.variants import create_variants

stubber/tools/manifestfile.py

@@ -26,10 +26,10 @@
 # THE SOFTWARE.
 
 from __future__ import print_function
-
 import contextlib
 import os
 import sys
+import glob
 import tempfile
 from collections import namedtuple
 
@@ -62,6 +62,9 @@ FILE_TYPE_LOCAL = 1
 # URL to file. (TODO)
 FILE_TYPE_HTTP = 2
 
+# Default list of libraries in micropython-lib to search for library packages.
+BASE_LIBRARY_NAMES = ("micropython", "python-stdlib", "python-ecosys")
+
 
 class ManifestFileError(Exception):
     pass
@@ -106,7 +109,7 @@ class ManifestPackageMetadata:
         self.stdlib = False
 
         # Allows a python-ecosys package to be annotated with the
-        # corresponding name in PyPI. e.g. micropython-lib/urequests is based
+        # corresponding name in PyPI. e.g. micropython-lib/requests is based
         # on pypi/requests.
         self.pypi = None
         # For a micropython package, this is the name that we will publish it
@@ -143,7 +146,7 @@ class ManifestPackageMetadata:
 
         self.description = description
         self.version = version
-        self.license = version
+        self.license = license
         self.author = author
         self.pypi = pypi
         self.pypi_publish = pypi_publish
@@ -194,6 +197,14 @@ class ManifestFile:
         self._visited = set()
         # Stack of metadata for each level.
         self._metadata = [ManifestPackageMetadata()]
+        # Registered external libraries.
+        self._libraries = {}
+        # List of directories to search for packages.
+        self._library_dirs = []
+        # Add default micropython-lib libraries if $(MPY_LIB_DIR) has been specified.
+        if self._path_vars["MPY_LIB_DIR"]:
+            for lib in BASE_LIBRARY_NAMES:
+                self.add_library(lib, os.path.join("$(MPY_LIB_DIR)", lib))
 
     def _resolve_path(self, path):
         # Convert path to an absolute path, applying variable substitutions.
@@ -208,6 +219,7 @@ class ManifestFile:
             "metadata": self.metadata,
             "include": self.include,
             "require": self.require,
+            "add_library": self.add_library,
             "package": self.package,
             "module": self.module,
             "options": IncludeOptions(**kwargs),
@@ -271,13 +283,15 @@ class ManifestFile:
             kind = KIND_COMPILE_AS_MPY
 
         self._manifest_files.append(
-            ManifestOutput(FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, self._metadata[-1], opt)
+            ManifestOutput(
+                FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, self._metadata[-1], opt
+            )
         )
 
     def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=False):
         base_path = self._resolve_path(base_path)
 
-        if files:
+        if files is not None:
             # Use explicit list of files (relative to package_path).
             for file in files:
                 if package_path:
@@ -386,14 +400,23 @@ class ManifestFile:
             if is_require:
                 self._metadata.pop()
 
-    def require(self, name, version=None, unix_ffi=False, pypi=None, **kwargs):
-        """
-        Require a module by name from micropython-lib.
+    def _require_from_path(self, library_path, name, version, extra_kwargs):
+        for root, dirnames, filenames in os.walk(library_path):
+            if os.path.basename(root) == name and "manifest.py" in filenames:
+                self.include(root, is_require=True, **extra_kwargs)
+                return True
+        return False
 
-        Optionally specify unix_ffi=True to use a module from the unix-ffi directory.
+    def require(self, name, version=None, pypi=None, library=None, **kwargs):
+        """
+        Require a package by name from micropython-lib.
 
         Optionally specify pipy="package-name" to indicate that this should
         use the named package from PyPI when building for CPython.
+
+        Optionally specify library="name" to reference a package from a
+        library that has been previously registered with add_library(). Otherwise
+        the list of library paths will be used.
         """
         self._metadata[-1].check_initialised(self._mode)
 
@@ -404,24 +427,41 @@ class ManifestFile:
             self._pypi_dependencies.append(pypi)
             return
 
-        if self._path_vars["MPY_LIB_DIR"]:
-            lib_dirs = ["micropython", "python-stdlib", "python-ecosys"]
-            if unix_ffi:
-                # Search unix-ffi only if unix_ffi=True, and make unix-ffi modules
-                # take precedence.
-                lib_dirs = ["unix-ffi"] + lib_dirs
-
-            for lib_dir in lib_dirs:
-                # Search for {lib_dir}/**/{name}/manifest.py.
-                for root, _, filenames in os.walk(os.path.join(self._path_vars["MPY_LIB_DIR"], lib_dir)):
-                    if os.path.basename(root) == name and "manifest.py" in filenames:
-                        self.include(root, is_require=True, **kwargs)
-                        return
-
-            raise ValueError("Library not found in local micropython-lib: {}".format(name))
-        else:
-            # TODO: HTTP request to obtain URLs from manifest.json.
-            raise ValueError("micropython-lib not available for require('{}').", name)
+        if library is not None:
+            # Find package in external library.
+            if library not in self._libraries:
+                raise ValueError("Unknown library '{}' for require('{}').".format(library, name))
+            library_path = self._libraries[library]
+            # Search for {library_path}/**/{name}/manifest.py.
+            if self._require_from_path(library_path, name, version, kwargs):
+                return
+            raise ValueError(
+                "Package '{}' not found in external library '{}' ({}).".format(
+                    name, library, library_path
+                )
+            )
+
+        for lib_dir in self._library_dirs:
+            # Search for {lib_dir}/**/{name}/manifest.py.
+            if self._require_from_path(lib_dir, name, version, kwargs):
+                return
+
+        raise ValueError("Package '{}' not found in any known library.".format(name))
+
+    def add_library(self, library, library_path, prepend=False):
+        """
+        Register the path to an external named library.
+
+        The path will be automatically searched when using require().  By default the
+        added library is added to the end of the list of libraries to search.  Pass
+        `prepend=True` to add it to the start of the list.
+
+        Additionally, the added library can be explicitly requested by using
+        `require("name", library="library")`.
+        """
+        library_path = self._resolve_path(library_path)
+        self._libraries[library] = library_path
+        self._library_dirs.insert(0 if prepend else len(self._library_dirs), library_path)
 
     def package(self, package_path, files=None, base_path=".", opt=None):
         """
@@ -563,6 +603,9 @@ def main():
         default=os.path.join(os.path.dirname(__file__), "../lib/micropython-lib"),
         help="path to micropython-lib repo",
     )
+    cmd_parser.add_argument(
+        "--unix-ffi", action="store_true", help="prepend unix-ffi to the library path"
+    )
     cmd_parser.add_argument("--port", default=None, help="path to port dir")
     cmd_parser.add_argument("--board", default=None, help="path to board dir")
     cmd_parser.add_argument(
@@ -592,6 +635,8 @@ def main():
         exit(1)
 
     m = ManifestFile(mode, path_vars)
+    if args.unix_ffi:
+        m.add_library("unix-ffi", os.path.join("$(MPY_LIB_DIR)", "unix-ffi"), prepend=True)
     for manifest_file in args.files:
         try:
             m.execute(manifest_file)

stubber/tools/readme.md

@@ -2,5 +2,6 @@ tools vendored from micropython
 
 - manifestfile.py 
   - Micropython manifest file parser 
-  - Micropython 1.19.1
-  - https://github.com/micropython/micropython/blob/master/tools/manifestfile.py
+  - https://github.com/micropython/micropython/blob/master/tools/manifestfile.py
+  - v1.23.0 
+    - https://raw.githubusercontent.com/micropython/micropython/v1.23.0/tools/manifestfile.py