bump versions

Josverl · Josverl · commit 6e9df8272439 · 2024-04-25T23:44:05.000+02:00
diff --git a/mip/full.json b/mip/full.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.19.0"
+  "version": "1.20.0"
 }
diff --git a/mip/minified.json b/mip/minified.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.19.0"
+  "version": "1.20.0"
 }
diff --git a/mip/mpy_v5.json b/mip/mpy_v5.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.19.0"
+  "version": "1.20.0"
 }
diff --git a/mip/mpy_v6.json b/mip/mpy_v6.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.19.0"
+  "version": "1.20.0"
 }
diff --git a/package.json b/package.json
@@ -18,5 +18,5 @@
     ]
   ],
   "deps": [],
-  "version": "1.19.0"
+  "version": "1.20.0"
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ repo-path = "./repos"
 
 [tool.poetry]
 name = "micropython-stubber"
-version = "1.19.0"
+version = "1.20.0"
 description = "Tooling to create and maintain stubs for MicroPython"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
diff --git a/src/mpflash/poetry.lock b/src/mpflash/poetry.lock
diff --git a/src/mpflash/pyproject.toml b/src/mpflash/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "0.6.0"
+version = "0.7.0"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
diff --git a/src/stubber/__init__.py b/src/stubber/__init__.py
@@ -1,3 +1,3 @@
 """get the version"""
 
-__version__ = "1.19.0"
+__version__ = "1.20.0"
diff --git a/src/stubber/board/createstubs.py b/src/stubber/board/createstubs.py
@@ -24,7 +24,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.19.0"
+__version__ = "v1.20.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
@@ -951,6 +951,7 @@ def main():
         "uwebsocket",
         "uzlib",
         "version",
+        "vfs",
         "websocket",
         "websocket_helper",
         "wipy",
diff --git a/src/stubber/board/createstubs_db.py b/src/stubber/board/createstubs_db.py
@@ -18,7 +18,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.19.0
+This variant was generated from createstubs.py by micropython-stubber v1.20.0
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -43,7 +43,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.19.0"
+__version__ = "v1.20.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
diff --git a/src/stubber/board/createstubs_db_min.py b/src/stubber/board/createstubs_db_min.py
@@ -51,7 +51,7 @@
 except O:pass
 try:from collections import OrderedDict as l
 except O:from ucollections import OrderedDict as l
-__version__='v1.19.0'
+__version__='v1.20.0'
 A3=2
 A4=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]
diff --git a/src/stubber/board/createstubs_db_mpy.mpy b/src/stubber/board/createstubs_db_mpy.mpy
diff --git a/src/stubber/board/createstubs_mem.py b/src/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.19.0
+This variant was generated from createstubs.py by micropython-stubber v1.20.0
 """
 
 # Copyright (c) 2019-2024 Jos Verlinde
@@ -34,7 +34,7 @@
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.19.0"
+__version__ = "v1.20.0"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = ["lib", "/lib", "/sd/lib", "/flash/lib", "."]
diff --git a/src/stubber/board/createstubs_mem_min.py b/src/stubber/board/createstubs_mem_min.py
@@ -47,7 +47,7 @@
 except N:pass
 try:from collections import OrderedDict as g
 except N:from ucollections import OrderedDict as g
-__version__='v1.19.0'
+__version__='v1.20.0'
 y=2
 z=2
 A0=['lib','/lib','/sd/lib','/flash/lib',J]
diff --git a/src/stubber/board/createstubs_mem_mpy.mpy b/src/stubber/board/createstubs_mem_mpy.mpy
diff --git a/src/stubber/board/createstubs_min.py b/src/stubber/board/createstubs_min.py
@@ -50,7 +50,7 @@
 except N:pass
 try:from collections import OrderedDict as h
 except N:from ucollections import OrderedDict as h
-__version__='v1.19.0'
+__version__='v1.20.0'
 A0=2
 A1=2
 A5=['lib','/lib','/sd/lib','/flash/lib',J]
@@ -287,7 +287,7 @@ def read_path():
 def j():
 	try:A=bytes('abc',encoding='utf8');B=j.__module__;return H
 	except(k,I):return U
-def main():stubber=Stubber(path=read_path());stubber.clean();stubber.modules=['WM8960','_OTA','_asyncio','_boot_fat','_coap','_espnow','_flash_control_OTA','_main_pybytes','_mqtt','_mqtt_core','_msg_handl','_onewire','_periodical_pin','_pybytes','_pybytes_ca','_pybytes_config','_pybytes_config_reader','_pybytes_connection','_pybytes_constants','_pybytes_debug','_pybytes_library','_pybytes_machine_learning','_pybytes_main','_pybytes_protocol','_pybytes_pyconfig','_pybytes_pymesh_config','_rp2','_terminal','_thread','_uasyncio','_urequest','adcfft','aioble/__init__','aioble/central','aioble/client','aioble/core','aioble/device','aioble/l2cap','aioble/peripheral','aioble/security','aioble/server','aioespnow','ak8963','apa102','apa106','argparse','array','asyncio/__init__','asyncio/core','asyncio/event','asyncio/funcs','asyncio/lock','asyncio/stream','binascii','bluetooth','breakout_as7262','breakout_bh1745','breakout_bme280','breakout_bme68x','breakout_bmp280','breakout_dotmatrix','breakout_encoder','breakout_icp10125','breakout_ioexpander','breakout_ltr559','breakout_matrix11x7','breakout_mics6814','breakout_msa301','breakout_paa5100','breakout_pmw3901','breakout_potentiometer','breakout_rgbmatrix5x5','breakout_rtc','breakout_scd41','breakout_sgp30','breakout_trackball','breakout_vl53l5cx','btree','cmath','collections','crypto','cryptolib','curl','deflate','dht','display','display_driver_utils','ds18x20','encoder','errno','esp','esp32','espidf','espnow','ffi','flashbdev','framebuf','freesans20','fs_driver','functools','galactic','gc','gfx_pack','gsm','hashlib','heapq','hub75','ili9341','ili9XXX','imagetools','inisetup','interstate75','io','jpegdec','json','lcd160cr','lodepng',w,'lsm6dsox','lv_colors','lv_utils','lvgl','lwip','machine','math','microWebSocket','microWebSrv','microWebTemplate',b,'mip','mip/__init__','mip/__main__','motor','mpu6500','mpu9250','neopixel','network','ntptime','onewire','os','pcf85063a','picoexplorer','picographics','picokeypad','picoscroll','picounicorn','picowireless','pimoroni','pimoroni_bus','pimoroni_i2c','plasma','platform','pyb',g,'pye','qrcode','queue','random','requests','requests/__init__','rp2','rtch','samd','select','servo','socket','ssd1306','ssh','ssl','stm','struct',v,'termios','time','tpcalib','uarray','uasyncio/__init__','uasyncio/core','uasyncio/event','uasyncio/funcs','uasyncio/lock','uasyncio/stream','uasyncio/tasks','ubinascii','ubluetooth','ucollections','ucrypto','ucryptolib','uctypes','uerrno','uftpd','uhashlib','uheapq','uio','ujson','ulab','ulab/approx','ulab/compare','ulab/fft','ulab/filter','ulab/linalg','ulab/numerical','ulab/poly','ulab/user','ulab/vector','umachine','umqtt/__init__','umqtt/robust','umqtt/simple','uos','uplatform','uqueue','urandom','ure','urequests','urllib/urequest','uselect','usocket','ussl','ustruct','usys','utelnetserver','utime','utimeq','uwebsocket','uzlib',C,'websocket','websocket_helper','wipy','writer','xpt2046','ymodem','zephyr','zlib'];F.collect();stubber.create_all_stubs()
+def main():stubber=Stubber(path=read_path());stubber.clean();stubber.modules=['WM8960','_OTA','_asyncio','_boot_fat','_coap','_espnow','_flash_control_OTA','_main_pybytes','_mqtt','_mqtt_core','_msg_handl','_onewire','_periodical_pin','_pybytes','_pybytes_ca','_pybytes_config','_pybytes_config_reader','_pybytes_connection','_pybytes_constants','_pybytes_debug','_pybytes_library','_pybytes_machine_learning','_pybytes_main','_pybytes_protocol','_pybytes_pyconfig','_pybytes_pymesh_config','_rp2','_terminal','_thread','_uasyncio','_urequest','adcfft','aioble/__init__','aioble/central','aioble/client','aioble/core','aioble/device','aioble/l2cap','aioble/peripheral','aioble/security','aioble/server','aioespnow','ak8963','apa102','apa106','argparse','array','asyncio/__init__','asyncio/core','asyncio/event','asyncio/funcs','asyncio/lock','asyncio/stream','binascii','bluetooth','breakout_as7262','breakout_bh1745','breakout_bme280','breakout_bme68x','breakout_bmp280','breakout_dotmatrix','breakout_encoder','breakout_icp10125','breakout_ioexpander','breakout_ltr559','breakout_matrix11x7','breakout_mics6814','breakout_msa301','breakout_paa5100','breakout_pmw3901','breakout_potentiometer','breakout_rgbmatrix5x5','breakout_rtc','breakout_scd41','breakout_sgp30','breakout_trackball','breakout_vl53l5cx','btree','cmath','collections','crypto','cryptolib','curl','deflate','dht','display','display_driver_utils','ds18x20','encoder','errno','esp','esp32','espidf','espnow','ffi','flashbdev','framebuf','freesans20','fs_driver','functools','galactic','gc','gfx_pack','gsm','hashlib','heapq','hub75','ili9341','ili9XXX','imagetools','inisetup','interstate75','io','jpegdec','json','lcd160cr','lodepng',w,'lsm6dsox','lv_colors','lv_utils','lvgl','lwip','machine','math','microWebSocket','microWebSrv','microWebTemplate',b,'mip','mip/__init__','mip/__main__','motor','mpu6500','mpu9250','neopixel','network','ntptime','onewire','os','pcf85063a','picoexplorer','picographics','picokeypad','picoscroll','picounicorn','picowireless','pimoroni','pimoroni_bus','pimoroni_i2c','plasma','platform','pyb',g,'pye','qrcode','queue','random','requests','requests/__init__','rp2','rtch','samd','select','servo','socket','ssd1306','ssh','ssl','stm','struct',v,'termios','time','tpcalib','uarray','uasyncio/__init__','uasyncio/core','uasyncio/event','uasyncio/funcs','uasyncio/lock','uasyncio/stream','uasyncio/tasks','ubinascii','ubluetooth','ucollections','ucrypto','ucryptolib','uctypes','uerrno','uftpd','uhashlib','uheapq','uio','ujson','ulab','ulab/approx','ulab/compare','ulab/fft','ulab/filter','ulab/linalg','ulab/numerical','ulab/poly','ulab/user','ulab/vector','umachine','umqtt/__init__','umqtt/robust','umqtt/simple','uos','uplatform','uqueue','urandom','ure','urequests','urllib/urequest','uselect','usocket','ussl','ustruct','usys','utelnetserver','utime','utimeq','uwebsocket','uzlib',C,'vfs','websocket','websocket_helper','wipy','writer','xpt2046','ymodem','zephyr','zlib'];F.collect();stubber.create_all_stubs()
 if __name__=='__main__'or j():
 	if not A4('no_auto_stubber.txt'):
 		try:F.threshold(4*1024);F.enable()
diff --git a/src/stubber/board/createstubs_mpy.mpy b/src/stubber/board/createstubs_mpy.mpy
diff --git a/src/stubber/board/modulelist.txt b/src/stubber/board/modulelist.txt
@@ -226,6 +226,7 @@ utimeq
 uwebsocket
 uzlib
 version
+vfs
 websocket
 websocket_helper
 wipy
diff --git a/src/stubber/update_fallback.py b/src/stubber/update_fallback.py
@@ -0,0 +1,117 @@
+# """build/update the fallback 'catch-all' stubfolder"""
+
+# import os
+# import shutil
+# from distutils.dir_util import copy_tree
+# from distutils.errors import DistutilsFileError
+# from pathlib import Path
+# from typing import List, Optional, Tuple
+
+# from loguru import logger as log
+
+# from stubber.utils.versions import V_PREVIEW
+
+# # log = logging.getLogger()
+
+# RELEASED = "v1_18"
+
+
+# def fallback_sources(version: str, fw_version: Optional[str] = None) -> List[Tuple[str, str]]:
+#     # sourcery skip: inline-immediately-returned-variable
+#     """
+#     list of sources to build/update the fallback 'catch-all' stubfolder
+#     version : the version to use
+#     fw_version : version to source the MCU stubs from. Defaults to the version used , but can be lower
+
+#     """
+#     if not fw_version:
+#         fw_version = version
+#     if fw_version == V_PREVIEW:
+#         fw_version = RELEASED
+#     SOURCES = [
+#         ("uasyncio", f"micropython-{fw_version}-esp32"),
+#         ("umqtt", f"micropython-{fw_version}-esp32"),
+#         ("_onewire.py*", f"micropython-{fw_version}-esp32"),
+#         ("_uasyncio.py*", f"micropython-{fw_version}-esp32"),
+#         ("array.py*", f"micropython-{fw_version}-esp32"),
+#         ("binascii.py*", f"micropython-{fw_version}-esp32"),
+#         ("hashlib.py*", f"micropython-{fw_version}-esp32"),
+#         ("machine.py*", f"micropython-{fw_version}-esp32"),
+#         ("micropython.py*", f"micropython-{version}-docstubs"),  # esp32"),
+#         ("network.pyi", f"micropython-{version}-docstubs"),  # esp32"),
+#         ("struct.py*", f"micropython-{fw_version}-esp32"),
+#         ("uarray.py*", f"micropython-{fw_version}-esp32"),
+#         ("ubinascii.py*", f"micropython-{fw_version}-esp32"),
+#         ("uctypes.py*", f"micropython-{fw_version}-esp32"),
+#         ("uerrno.py*", f"micropython-{fw_version}-esp32"),
+#         ("uhashlib.py*", f"micropython-{fw_version}-esp32"),
+#         ("uio.py*", f"micropython-{fw_version}-esp32"),
+#         ("ujson.py*", f"micropython-{fw_version}-esp32"),
+#         ("uselect.py*", f"micropython-{fw_version}-esp32"),
+#         ("usocket.py*", f"micropython-{fw_version}-esp32"),
+#         ("ussl.py*", f"micropython-{fw_version}-esp32"),
+#         ("ustruct.py*", f"micropython-{fw_version}-esp32"),
+#         ("sys.py*", f"micropython-{fw_version}-esp32"),
+#         ("usys.py*", f"micropython-{fw_version}-esp32"),
+#         ("uzlib.py*", f"micropython-{fw_version}-esp32"),
+#         ("bluetooth.py*", f"micropython-{version}-docstubs"),
+#         # esp
+#         ("esp.py*", f"micropython-{version}-docstubs"),  # 8266 fw stub has most functions
+#         ("esp32.py*", f"micropython-{version}-docstubs"),  # esp32"),
+#         # pyboard == stm32
+#         ("pyb.py*", f"micropython-{fw_version}-stm32"),
+#         ("framebuf.py*", f"micropython-{fw_version}-stm32"),
+#         # rp2
+#         ("_rp2.py*", f"micropython-{fw_version}-rp2"),
+#         # stdlib
+#         ("os.py*", f"micropython-{fw_version}-esp32"),  # -> stdlib
+#         ("uos.py*", f"micropython-{fw_version}-esp32"),
+#         ("time.py*", f"micropython-{fw_version}-esp32"),  # -> stdlib
+#         ("utime.py*", f"micropython-{fw_version}-esp32"),
+#     ]
+#     return SOURCES
+
+
+# def update_fallback(stubpath: Path, fallback_path: Path, version: str = RELEASED):
+#     "update the fallback stubs from the defined sources"
+#     # remove all *.py/.pyi files
+#     if not fallback_path.exists():
+#         os.makedirs(fallback_path)
+#     else:
+#         oldstubs = list(fallback_path.rglob("*.py")) + list(fallback_path.rglob("*.pyi"))
+#         log.debug(f"deleting {len(oldstubs)} stubs from {fallback_path.as_posix()}")
+#         for f in oldstubs:
+#             try:
+#                 os.remove(f)
+#             except OSError as e:
+#                 log.warning(e)
+#     added = 0
+#     for name, source in fallback_sources(version):
+#         if "." not in name:
+#             # copy folder
+#             log.debug(f"add {source} folder")
+#             try:
+#                 copy_tree(
+#                     (stubpath / source / name).as_posix(),
+#                     (fallback_path / name).as_posix(),
+#                 )
+#                 added += 1
+#             except DistutilsFileError:
+#                 log.warning(f"{(stubpath / source / name).as_posix()} not found")
+#         else:
+#             # copy file(s)
+#             log.debug(f"add {source}")
+#             for f in (stubpath / source).glob(name):
+#                 shutil.copyfile(f, fallback_path / f.name)
+#                 added += 1
+#     return added
+
+
+# if __name__ == "__main__":
+#     from stubber.utils.config import CONFIG
+
+#     update_fallback(
+#         CONFIG.stub_path,
+#         CONFIG.fallback_path,
+#         version=RELEASED,
+#     )

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`]`
`19`	`19`	`],`
`20`	`20`	`"deps": [],`
`21`		`- "version": "1.19.0"`
	`21`	`+ "version": "1.20.0"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""get the version"""`
`2`	`2`
`3`		`-__version__ = "1.19.0"`
	`3`	`+__version__ = "1.20.0"`