micropython-stubber 1.15.0__py3-none-any.whl → 1.15.1__py3-none-any.whl

stubber/board/createstubs_min.py

@@ -1,23 +1,24 @@
-w='pyb'
-v='{}/{}'
-u='logging'
-t='sys'
-s='method'
-r='function'
-q='bool'
-p='str'
-o='float'
-n='int'
-m='port'
-l=NameError
-k=sorted
-j=NotImplementedError
-b='pycom'
-a=',\n'
-Z='dict'
-Y='list'
-X='tuple'
-W='micropython'
+x='pyb'
+w='{}/{}'
+v='logging'
+u='sys'
+t='method'
+s='function'
+r='bool'
+q='str'
+p='float'
+o='int'
+n='port'
+m=NameError
+l=sorted
+k=NotImplementedError
+c='pycom'
+b=',\n'
+a='dict'
+Z='list'
+Y='tuple'
+X='micropython'
+W='stubber'
 V=open
 U=repr
 S='_'
@@ -39,32 +40,32 @@ F=OSError
 D='version'
 B=''
 import gc as C,os,sys
-from ujson import dumps as c
+from ujson import dumps as d
 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.15.0'
-x=2
+try:from collections import OrderedDict as e
+except N:from ucollections import OrderedDict as e
+__version__='v1.15.1'
 y=2
-z=[K,'/lib','/sd/lib','/flash/lib','lib']
+z=2
+A0=[K,'/lib','/sd/lib','/flash/lib','lib']
 from time import sleep
 class Stubber:
 	def __init__(A,path=E,firmware_id=E):
 		B=firmware_id
 		try:
-			if os.uname().release=='1.13.0'and os.uname().version<'v1.13-103':raise j('MicroPython 1.13.0 cannot be stubbed')
+			if os.uname().release=='1.13.0'and os.uname().version<'v1.13-103':raise k('MicroPython 1.13.0 cannot be stubbed')
 		except H:pass
-		A._report=[];A.info=_info();J('Port: {}'.format(A.info[m]));J('Board: {}'.format(A.info[I]));C.collect()
+		A.log=E;A.log=logging.getLogger(W);A._report=[];A.info=_info();J('Port: {}'.format(A.info[n]));J('Board: {}'.format(A.info[I]));C.collect()
 		if B:A._fwid=B.lower()
-		elif A.info[L]==W:A._fwid='{family}-{ver}-{port}-{board}'.format(**A.info)
+		elif A.info[L]==X:A._fwid='{family}-{ver}-{port}-{board}'.format(**A.info)
 		else:A._fwid='{family}-{ver}-{port}'.format(**A.info)
 		A._start_free=C.mem_free()
 		if path:
 			if path.endswith(G):path=path[:-1]
 		else:path=get_root()
 		A.path='{}/stubs/{}'.format(path,A.flat_fwid).replace('//',G)
-		try:e(path+G)
+		try:f(path+G)
 		except F:J('error creating stub folder {}'.format(path))
 		A.problematic=['upip','upysh','webrepl_setup','http_client','http_client_ssl','http_server','http_server_ssl'];A.excluded=['webrepl','_webrepl','port_diag','example_sub_led.py','example_pub_button.py'];A.modules=[]
 	def get_obj_attributes(L,item_instance):
@@ -75,15 +76,15 @@ class Stubber:
 				E=getattr(I,A)
 				try:F=U(type(E)).split("'")[1]
 				except P:F=B
-				if F in{n,o,p,q,X,Y,Z}:G=1
-				elif F in{r,s}:G=2
+				if F in{o,p,q,r,Y,Z,a}:G=1
+				elif F in{s,t}:G=2
 				elif F in'class':G=3
 				else:G=4
 				D.append((A,U(E),U(type(E)),E,G))
 			except H as K:J.append("Couldn't get attribute '{}' from object '{}', Err: {}".format(A,I,K))
 			except MemoryError as K:sleep(1);reset()
-		D=k([A for A in D if not A[0].startswith('__')],key=lambda x:x[4]);C.collect();return D,J
-	def add_modules(A,modules):A.modules=k(set(A.modules)|set(modules))
+		D=l([A for A in D if not A[0].startswith('__')],key=lambda x:x[4]);C.collect();return D,J
+	def add_modules(A,modules):A.modules=l(set(A.modules)|set(modules))
 	def create_all_stubs(A):
 		C.collect()
 		for B in A.modules:A.create_one_stub(B)
@@ -103,10 +104,10 @@ class Stubber:
 		J=E
 		try:J=__import__(D,E,E,'*');T=C.mem_free()
 		except N:return A
-		e(H)
+		f(H)
 		with V(H,'w')as L:P=str(I.info).replace('OrderedDict(',B).replace('})','}');R='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(D,I._fwid,P,__version__);L.write(R);L.write('from typing import Any\nfrom _typeshed import Incomplete\n\n');I.write_object_stub(L,J,D,B)
 		I._report.append('{{"module": "{}", "file": "{}"}}'.format(D,H.replace('\\',G)))
-		if D not in{'os',t,u,'gc'}:
+		if D not in{'os',u,v,'gc'}:
 			try:del J
 			except (F,Q):pass
 			try:del sys.modules[D]
@@ -120,23 +121,23 @@ class Stubber:
 		for (E,K,G,T,f) in S:
 			if E in['classmethod','staticmethod','BaseException',N]:continue
 			if E[0].isdigit():continue
-			if G=="<class 'type'>"and R(D)<=y*4:
+			if G=="<class 'type'>"and R(D)<=z*4:
 				U=B;V=E.endswith(N)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
 				if V:U=N
 				A='\n{}class {}({}):\n'.format(D,E,U)
 				if V:A+=D+'    ...\n';H.write(A);return
 				H.write(A);L.write_object_stub(H,T,'{0}.{1}'.format(obj_name,E),D+'    ',P+1);A=D+'    def __init__(self, *argv, **kwargs) -> None:\n';A+=D+'        ...\n\n';H.write(A)
-			elif any((A in G for A in[s,r,'closure'])):
-				W=b;a=B
-				if P>0:a='self, '
+			elif any((A in G for A in[t,s,'closure'])):
+				W=b;X=B
+				if P>0:X='self, '
 				if c in G or c in K:A='{}@classmethod\n'.format(D)+'{}def {}(cls, *args, **kwargs) -> {}:\n'.format(D,E,W)
-				else:A='{}def {}({}*args, **kwargs) -> {}:\n'.format(D,E,a,W)
+				else:A='{}def {}({}*args, **kwargs) -> {}:\n'.format(D,E,X,W)
 				A+=D+'    ...\n\n';H.write(A)
 			elif G=="<class 'module'>":0
 			elif G.startswith("<class '"):
 				I=G[8:-2];A=B
-				if I in[p,n,o,q,'bytearray','bytes']:A=d.format(D,E,K,I)
-				elif I in[Z,Y,X]:e={Z:'{}',Y:'[]',X:'()'};A=d.format(D,E,e[I],I)
+				if I in[q,o,p,r,'bytearray','bytes']:A=d.format(D,E,K,I)
+				elif I in[a,Z,Y]:e={a:'{}',Z:'[]',Y:'()'};A=d.format(D,E,e[I],I)
 				else:
 					if I not in['object','set','frozenset']:I=b
 					A='{0}{1} : {2} ## {3} = {4}\n'.format(D,E,I,G,K)
@@ -144,7 +145,7 @@ class Stubber:
 			else:H.write("# all other, type = '{0}'\n".format(G));H.write(D+E+' # type: Incomplete\n')
 		del S;del M
 		try:del E,K,G,T
-		except (F,Q,l):pass
+		except (F,Q,m):pass
 	@property
 	def flat_fwid(self):
 		A=self._fwid;B=' .()/\\:$'
@@ -156,13 +157,13 @@ class Stubber:
 		try:os.stat(path);C=os.listdir(path)
 		except (F,H):return
 		for D in C:
-			A=v.format(path,D)
+			A=w.format(path,D)
 			try:os.remove(A)
 			except F:
 				try:B.clean(A);os.rmdir(A)
 				except F:pass
 	def report(B,filename='modules.json'):
-		G=v.format(B.path,filename);C.collect()
+		G=w.format(B.path,filename);C.collect()
 		try:
 			with V(G,'w')as D:
 				B.write_json_header(D);E=M
@@ -170,12 +171,12 @@ class Stubber:
 				B.write_json_end(D)
 			I=B._start_free-C.mem_free()
 		except F:J('Failed to create the report.')
-	def write_json_header(B,f):A='firmware';f.write('{');f.write(c({A:B.info})[1:-1]);f.write(a);f.write(c({'stubber':{D:__version__},'stubtype':A})[1:-1]);f.write(a);f.write('"modules" :[\n')
+	def write_json_header(B,f):A='firmware';f.write('{');f.write(d({A:B.info})[1:-1]);f.write(b);f.write(d({W:{D:__version__},'stubtype':A})[1:-1]);f.write(b);f.write('"modules" :[\n')
 	def write_json_node(A,f,n,first):
-		if not first:f.write(a)
+		if not first:f.write(b)
 		f.write(n)
 	def write_json_end(A,f):f.write('\n]}')
-def e(path):
+def f(path):
 	A=C=0
 	while A!=-1:
 		A=path.find(G,C)
@@ -183,7 +184,7 @@ def e(path):
 			B=path[0]if A==0 else path[:A]
 			try:H=os.stat(B)
 			except F as D:
-				if D.args[0]==x:
+				if D.args[0]==y:
 					try:os.mkdir(B)
 					except F as E:J('failed to create folder {}'.format(B));raise E
 		C=A+1
@@ -193,20 +194,20 @@ def T(s):
 	if A in s:s=s.split(A,1)[0]
 	return s.split('-')[1]if'-'in s else B
 def _info():
-	i='ev3-pybricks';h='pycopy';e='GENERIC';c='arch';a='cpu';Z='ver';V='with';G='mpy';F='build';A=d({L:sys.implementation.name,D:B,F:B,Z:B,m:'stm32'if sys.platform.startswith(w)else sys.platform,I:e,a:B,G:B,c:B})
+	i='ev3-pybricks';f='pycopy';d='GENERIC';b='arch';a='cpu';Z='ver';V='with';G='mpy';F='build';A=e({L:sys.implementation.name,D:B,F:B,Z:B,n:'stm32'if sys.platform.startswith(x)else sys.platform,I:d,a:B,G:B,b:B})
 	try:A[D]=K.join([str(A)for A in sys.implementation.version])
 	except H:pass
-	try:X=sys.implementation._machine if'_machine'in O(sys.implementation)else os.uname().machine;A[I]=X.strip();A[a]=X.split(V)[1].strip();A[G]=sys.implementation._mpy if'_mpy'in O(sys.implementation)else sys.implementation.mpy if G in O(sys.implementation)else B
+	try:W=sys.implementation._machine if'_machine'in O(sys.implementation)else os.uname().machine;A[I]=W.strip();A[a]=W.split(V)[1].strip();A[G]=sys.implementation._mpy if'_mpy'in O(sys.implementation)else sys.implementation.mpy if G in O(sys.implementation)else B
 	except (H,P):pass
 	C.collect()
-	for M in [A+'/board_info.csv'for A in z]:
-		if g(M):
+	for M in [A+'/board_info.csv'for A in A0]:
+		if h(M):
 			J=A[I].strip()
-			if f(A,J,M):break
+			if g(A,J,M):break
 			if V in J:
 				J=J.split(V)[0].strip()
-				if f(A,J,M):break
-			A[I]=e
+				if g(A,J,M):break
+			A[I]=d
 	A[I]=A[I].replace(' ',S);C.collect()
 	try:
 		A[F]=T(os.uname()[3])
@@ -217,18 +218,18 @@ def _info():
 	if A[D]==B and sys.platform not in('unix','win32'):
 		try:j=os.uname();A[D]=j.release
 		except (P,H,TypeError):pass
-	for (k,l,n) in [(h,h,'const'),(b,b,'FAT'),(i,'pybricks.hubs','EV3Brick')]:
-		try:o=__import__(l,E,E,n);A[L]=k;del o;break
+	for (k,l,m) in [(f,f,'const'),(c,c,'FAT'),(i,'pybricks.hubs','EV3Brick')]:
+		try:o=__import__(l,E,E,m);A[L]=k;del o;break
 		except (N,Q):pass
 	if A[L]==i:A['release']='2.0.0'
-	if A[L]==W:
+	if A[L]==X:
 		if A[D]and A[D].endswith('.0')and A[D]>='1.10.0'and A[D]<='1.19.9':A[D]=A[D][:-2]
 	if G in A and A[G]:
 		U=int(A[G]);Y=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][U>>10]
-		if Y:A[c]=Y
+		if Y:A[b]=Y
 		A[G]='v{}.{}'.format(U&255,U>>8&3)
 	A[Z]=f"v{A[D]}-{A[F]}"if A[F]else f"v{A[D]}";return A
-def f(info,board_descr,filename):
+def g(info,board_descr,filename):
 	with V(filename,'r')as C:
 		while 1:
 			B=C.readline()
@@ -244,28 +245,28 @@ def get_root():
 		try:C=os.stat(B);break
 		except F:continue
 	return B
-def g(filename):
+def h(filename):
 	try:
 		if os.stat(filename)[0]>>14:return M
 		return A
 	except F:return A
-def h():sys.exit(1)
+def i():sys.exit(1)
 def read_path():
 	path=B
 	if R(sys.argv)==3:
 		A=sys.argv[1].lower()
 		if A in('--path','-p'):path=sys.argv[2]
-		else:h()
-	elif R(sys.argv)==2:h()
+		else:i()
+	elif R(sys.argv)==2:i()
 	return path
-def i():
-	try:B=bytes('abc',encoding='utf8');C=i.__module__;return A
-	except (j,H):return M
-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','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','flashbdev','framebuf','freesans20','fs_driver','functools','galactic','gc','gfx_pack','gsm','hashlib','heapq','hub75','ili9341','ili9XXX','imagetools','inisetup','interstate75','io','jpegdec','json','lcd160cr','lodepng',u,'lsm6dsox','lv_colors','lv_utils','lvgl','lwip','machine','math','microWebSocket','microWebSrv','microWebTemplate',W,'mip','mip/__init__','motor','mpu6500','mpu9250','neopixel','network','ntptime','onewire','os','pcf85063a','picoexplorer','picographics','picokeypad','picoscroll','picounicorn','picowireless','pimoroni','pimoroni_bus','pimoroni_i2c','plasma','platform',w,b,'pye','qrcode','queue','random','requests','rp2','rtch','samd','select','servo','socket','ssd1306','ssh','ssl','stm','struct',t,'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',D,'websocket','websocket_helper','wipy','writer','xpt2046','ymodem','zephyr','zlib'];C.collect();stubber.create_all_stubs();stubber.report()
-if __name__=='__main__'or i():
-	try:logging.basicConfig(level=logging.INFO)
-	except l:pass
-	if not g('no_auto_stubber.txt'):
+def j():
+	try:B=bytes('abc',encoding='utf8');C=j.__module__;return A
+	except (k,H):return M
+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','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','flashbdev','framebuf','freesans20','fs_driver','functools','galactic','gc','gfx_pack','gsm','hashlib','heapq','hub75','ili9341','ili9XXX','imagetools','inisetup','interstate75','io','jpegdec','json','lcd160cr','lodepng',v,'lsm6dsox','lv_colors','lv_utils','lvgl','lwip','machine','math','microWebSocket','microWebSrv','microWebTemplate',X,'mip','mip/__init__','motor','mpu6500','mpu9250','neopixel','network','ntptime','onewire','os','pcf85063a','picoexplorer','picographics','picokeypad','picoscroll','picounicorn','picowireless','pimoroni','pimoroni_bus','pimoroni_i2c','plasma','platform',x,c,'pye','qrcode','queue','random','requests','rp2','rtch','samd','select','servo','socket','ssd1306','ssh','ssl','stm','struct',u,'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',D,'websocket','websocket_helper','wipy','writer','xpt2046','ymodem','zephyr','zlib'];C.collect();stubber.create_all_stubs();stubber.report()
+if __name__=='__main__'or j():
+	try:A1=logging.getLogger(W);logging.basicConfig(level=logging.INFO)
+	except m:pass
+	if not h('no_auto_stubber.txt'):
 		try:C.threshold(4*1024);C.enable()
 		except BaseException:pass
 		main()

stubber/board/info.py

@@ -0,0 +1,183 @@
+import gc
+import logging
+import os
+import sys
+
+LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
+# from ujson import dumps
+
+try:
+    from machine import reset  # type: ignore
+except ImportError:
+    pass
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ucollections import OrderedDict  # type: ignore
+
+
+def _info():  # type:() -> dict[str, str]
+    info = OrderedDict(
+        {
+            "family": sys.implementation.name,
+            "version": "",
+            "build": "",
+            "ver": "",
+            "port": "stm32"
+            if sys.platform.startswith("pyb")
+            else sys.platform,  # port: esp32 / win32 / linux / stm32
+            "board": "GENERIC",
+            "cpu": "",
+            "mpy": "",
+            "arch": "",
+        }
+    )
+    try:
+        info["version"] = ".".join([str(n) for n in sys.implementation.version])
+    except AttributeError:
+        pass
+    try:
+        machine = (
+            sys.implementation._machine
+            if "_machine" in dir(sys.implementation)
+            else os.uname().machine
+        )
+        info["board"] = machine.strip()
+        info["cpu"] = machine.split("with")[1].strip()
+        info["mpy"] = (
+            sys.implementation._mpy
+            if "_mpy" in dir(sys.implementation)
+            else sys.implementation.mpy
+            if "mpy" in dir(sys.implementation)
+            else ""
+        )
+    except (AttributeError, IndexError):
+        pass
+    gc.collect()
+    for filename in [d + "/board_info.csv" for d in LIBS]:
+        print("Check file:", filename)
+        if file_exists(filename):
+            print("Found board info file: {}".format(filename))
+            b = info["board"].strip()
+            if find_board(info, b, filename):
+                break
+            if "with" in b:
+                b = b.split("with")[0].strip()
+                if find_board(info, b, filename):
+                    break
+            info["board"] = "GENERIC"
+            break
+    info["board"] = info["board"].replace(" ", "_")
+    gc.collect()
+
+    try:
+        # extract build from uname().version if available
+        info["build"] = _build(os.uname()[3])
+        if not info["build"]:
+            # extract build from uname().release if available
+            info["build"] = _build(os.uname()[2])
+        if not info["build"] and ";" in sys.version:
+            # extract build from uname().release if available
+            info["build"] = _build(sys.version.split(";")[1])
+    except (AttributeError, IndexError):
+        pass
+    # avoid  build hashes
+    if info["build"] and len(info["build"]) > 5:
+        info["build"] = ""
+
+    if info["version"] == "" and sys.platform not in ("unix", "win32"):
+        try:
+            u = os.uname()
+            info["version"] = u.release
+        except (IndexError, AttributeError, TypeError):
+            pass
+    # detect families
+    for fam_name, mod_name, mod_thing in [
+        ("pycopy", "pycopy", "const"),
+        ("pycom", "pycom", "FAT"),
+        ("ev3-pybricks", "pybricks.hubs", "EV3Brick"),
+    ]:
+        try:
+            _t = __import__(mod_name, None, None, (mod_thing))
+            info["family"] = fam_name
+            del _t
+            break
+        except (ImportError, KeyError):
+            pass
+
+    if info["family"] == "ev3-pybricks":
+        info["release"] = "2.0.0"
+
+    if info["family"] == "micropython":
+        if (
+            info["version"]
+            and info["version"].endswith(".0")
+            and info["version"]
+            >= "1.10.0"  # versions from 1.10.0 to 1.20.0 do not have a micro .0
+            and info["version"] <= "1.19.9"
+        ):
+            # drop the .0 for newer releases
+            info["version"] = info["version"][:-2]
+
+    # spell-checker: disable
+    if "mpy" in info and info["mpy"]:  # mpy on some v1.11+ builds
+        sys_mpy = int(info["mpy"])
+        # .mpy architecture
+        arch = [
+            None,
+            "x86",
+            "x64",
+            "armv6",
+            "armv6m",
+            "armv7m",
+            "armv7em",
+            "armv7emsp",
+            "armv7emdp",
+            "xtensa",
+            "xtensawin",
+        ][sys_mpy >> 10]
+        if arch:
+            info["arch"] = arch
+        # .mpy version.minor
+        info["mpy"] = "v{}.{}".format(sys_mpy & 0xFF, sys_mpy >> 8 & 3)
+    # simple to use version[-build] string
+    info["ver"] = f"v{info['version']}-{info['build']}" if info["build"] else f"v{info['version']}"
+
+    return info
+
+
+def find_board(info: dict, board_descr: str, filename: str):
+    print("Find board '{}' in the provided board_info.csv file".format(board_descr))
+    with open(filename, "r") as file:
+        # ugly code to make testable in python and micropython
+        while 1:
+            line = file.readline()
+            if not line:
+                break
+            descr_, board_ = line.split(",")[0].strip(), line.split(",")[1].strip()
+            if descr_ == board_descr:
+                info["board"] = board_
+                return True
+    return False
+
+
+def file_exists(filename: str):
+    try:
+        if os.stat(filename)[0] >> 14:
+            return True
+        return False
+    except OSError:
+        return False
+
+
+def _build(s):
+    # extract a build nr from a string
+    if not s:
+        return ""
+    if " on " in s:
+        s = s.split(" on ", 1)[0]
+    return s.split("-")[1] if "-" in s else ""
+
+
+print(f"info: {_info()}")

stubber/minify.py

@@ -80,17 +80,17 @@ def edit_lines(content: str, edits: LineEdits, diff: bool = False):
         """Handles edits that require multiline comments
 
         Example:
-            self._log.debug("info: {} {}".format(
+            self.log.debug("info: {} {}".format(
                 1,
                 2
             ))
-        Here, only commenting out the first self._log line will raise
+        Here, only commenting out the first self.log line will raise
         an error. So this function returns all lines that need to
         be commented out instead.
 
         It also checks for situations such as this:
             if condition:
-                self._log.debug('message')
+                self.log.debug('message')
 
         Here, since the only functionality of the conditional is the call log,
         both lines would be returned to comment out.
@@ -129,9 +129,9 @@ def edit_lines(content: str, edits: LineEdits, diff: bool = False):
             try:
                 something()
             except:
-                self._log.debug('some message')
+                self.log.debug('some message')
 
-        Simply removing the self._log call would create a syntax error,
+        Simply removing the self.log call would create a syntax error,
         which is what this function checks for.
 
         """
@@ -214,33 +214,33 @@ def minify_script(source_script: StubSource, keep_report: bool = True, diff: boo
         ("comment", "import logging"),
         # report keepers may be inserted here
         # do report errors
-        ("rprint", "self._log.error"),
-        ("rprint", "_log.error"),
+        ("rprint", "self.log.error"),
+        ("rprint", "log.error"),
     ]
     if keep_report:
         # insert report keepers after the comment modifiers
         edits += [
             # keepers
-            ("rprint", 'self._log.info("Stub module: '),
-            ("rprint", 'self._log.warning("{}Skip module:'),
-            ("rprint", 'self._log.info("Clean/remove files in folder:'),
-            ("rprint", 'self._log.info("Created stubs for'),
-            ("rprint", 'self._log.info("Family: '),
-            ("rprint", 'self._log.info("Version: '),
-            ("rprint", 'self._log.info("Port: '),
-            ("rprint", 'self._log.info("Board: '),
+            ("rprint", 'self.log.info("Stub module: '),
+            ("rprint", 'self.log.warning("{}Skip module:'),
+            ("rprint", 'self.log.info("Clean/remove files in folder:'),
+            ("rprint", 'self.log.info("Created stubs for'),
+            ("rprint", 'self.log.info("Family: '),
+            ("rprint", 'self.log.info("Version: '),
+            ("rprint", 'self.log.info("Port: '),
+            ("rprint", 'self.log.info("Board: '),
             # all others
-            ("comment", "self._log."),
+            ("comment", "self.log."),
             ("comment", "_log ="),
         ]
     else:
         edits += [
             #  remove first full
-            ("comment", "self._log ="),
-            ("comment", "self._log("),
-            ("comment", "self._log.debug"),
-            ("comment", "self._log.info"),
-            ("comment", "self._log.warning"),
+            ("comment", "self.log ="),
+            ("comment", "self.log("),
+            ("comment", "self.log.debug"),
+            ("comment", "self.log.info"),
+            ("comment", "self.log.warning"),
             # then short versions
             ("comment", "_log ="),
             ("comment", "_log.debug"),
@@ -342,15 +342,15 @@ def cross_compile(
         # target must be a Path object
         _target = get_temp_file(suffix=".mpy")
 
-    cmd = ["pipx", "run", f"mpy-cross=={version}"] if version else ["pipx", "run", "mpy-cross"]
-    # Add params
-    cmd += ["-O2", str(source_file), "-o", str(_target), "-s", "createstubs.py"]
-    log.trace(" ".join(cmd))
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    result = pipx_mpy_cross(version, source_file, _target)
+    if result.stderr and "No matching distribution found for mpy-cross==" in result.stderr:
+        log.warning(f"mpy-cross=={version} not found, using latest")
+        result = pipx_mpy_cross("latest", source_file, _target)
+
     if result.returncode == 0:
         log.debug(f"mpy-cross compiled to    : {_target.name}")
     else:
-        log.error("mpy-cross failed to compile:")
+        log.error(f"mpy-cross failed to compile:{result.returncode} \n{result.stderr}")
 
     if isinstance(target, BytesIO):
         # copy the byte contents of the temp file to the target file-like object
@@ -361,6 +361,21 @@ def cross_compile(
     return result.returncode
 
 
+def pipx_mpy_cross(version, source_file, _target):
+    """Run mpy-cross using pipx"""
+    if version == "latest":
+        version = ""
+    if version:
+        version = "==" + version
+
+    cmd = ["pipx", "run", f"mpy-cross{version}"] if version else ["pipx", "run", "mpy-cross"]
+    # Add params
+    cmd += ["-O2", str(source_file), "-o", str(_target), "-s", "createstubs.py"]
+    log.trace(" ".join(cmd))
+    result = subprocess.run(cmd, capture_output=True, text=True)
+    return result
+
+
 def write_to_temp_file(source: str):
     """Writes a string to a temp file and returns the Path object"""
     _, temp_file = tempfile.mkstemp(suffix=".py", prefix="mpy_cross_")

stubber/publish/stubpacker.py

@@ -318,7 +318,8 @@ class StubPackage:
                 if (CONFIG.stub_path / fw_path).exists():
                     updated_sources.append((stub_type, fw_path))
                 else:
-                    updated_sources.append((stub_type, fw_path.with_name("GENERIC")))
+                    if fw_path.with_name("GENERIC").exists():
+                        updated_sources.append((stub_type, fw_path.with_name("GENERIC")))
             elif stub_type == StubSource.MERGED:
                 # Use the default board folder instead of the GENERIC board folder (if it exists)
                 if self.board.upper() == GENERIC_U:

stubber/rst/lookup.py

@@ -20,7 +20,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, Iterator",
+    "from typing import IO, Any, Callable, Coroutine, Dict, Generator, Iterator, List, NoReturn, Optional, Tuple, Union, NamedTuple, TypeVar",
     "from _typeshed import Incomplete",
 ]