micropython-stubber 1.16.0__tar.gz → 1.16.2__tar.gz

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.16.0
+Version: 1.16.2
 Summary: Tooling to create and maintain stubs for MicroPython
 Home-page: https://github.com/Josverl/micropython-stubber#readme
 License: MIT
@@ -28,6 +28,7 @@ Requires-Dist: importlib-metadata (>=1.0,<2.0) ; python_version < "3.8"
 Requires-Dist: libcst (>=1.1.0,<2.0.0)
 Requires-Dist: loguru (>=0.6,<0.8)
 Requires-Dist: mypy (==1.7.0)
+Requires-Dist: mypy-gitlab-code-quality (>=1.1.0,<2.0.0)
 Requires-Dist: packaging (>=21.3,<24.0)
 Requires-Dist: pipx (>=1.1.0,<2.0.0)
 Requires-Dist: pygithub (>=2.1.1,<3.0.0)

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/pyproject.toml

@@ -8,7 +8,7 @@ repo-path = "./repos"
 
 [tool.poetry]
 name = "micropython-stubber"
-version = "1.16.0"
+version = "1.16.2"
 description = "Tooling to create and maintain stubs for MicroPython"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
@@ -70,6 +70,7 @@ tomli-w = "^1.0.0"
 typed-config = "^1.3.0"
 pyserial = "^3.5"
 executing = "^2.0.1"
+mypy-gitlab-code-quality = "^1.1.0"
 
 [tool.poetry.extras]
 tools = ["esptool"]
@@ -87,7 +88,7 @@ sphinxcontrib-mermaid = ">=0.9.2"
 [tool.poetry.group.dev]
 optional = true
 [tool.poetry.group.dev.dependencies]
-coverage = "^6.4.3"
+coverage = ">=6.4.3,<8.0.0"
 distro = "^1.8.0"
 mock = "^4.0.3"
 pydeps = "^1.10.22"

micropython_stubber-1.16.2/src/stubber/__init__.py

@@ -0,0 +1,4 @@
+"""get the version"""
+
+
+__version__ = "1.16.2"

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/src/stubber/board/createstubs.py

@@ -20,7 +20,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.16.0"
+__version__ = "v1.16.2"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
@@ -455,15 +455,20 @@ def _info():  # type:() -> dict[str, str]
             "version": "",
             "build": "",
             "ver": "",
-            "port": "stm32"
-            if sys.platform.startswith("pyb")
-            else sys.platform,  # port: esp32 / win32 / linux / stm32
+            "port": sys.platform,  # port: esp32 / win32 / linux / stm32
             "board": "GENERIC",
             "cpu": "",
             "mpy": "",
             "arch": "",
         }
     )
+    # change port names to be consistent with the repo
+    if info["port"].startswith("pyb"):
+        info["port"] = "stm32"
+    elif info["port"] == "win32":
+        info["port"] = "windows"
+    elif info["port"] == "linux":
+        info["port"] = "unix"
     try:
         info["version"] = ".".join([str(n) for n in sys.implementation.version])
     except AttributeError:
@@ -715,6 +720,7 @@ def main():
         "ak8963",
         "apa102",
         "apa106",
+        "argparse",
         "array",
         "asyncio/__init__",
         "asyncio/core",
@@ -763,6 +769,7 @@ def main():
         "esp32",
         "espidf",
         "espnow",
+        "ffi",
         "flashbdev",
         "framebuf",
         "freesans20",
@@ -799,6 +806,7 @@ def main():
         "micropython",
         "mip",
         "mip/__init__",
+        "mip/__main__",
         "motor",
         "mpu6500",
         "mpu9250",
@@ -826,6 +834,7 @@ def main():
         "queue",
         "random",
         "requests",
+        "requests/__init__",
         "rp2",
         "rtch",
         "samd",
@@ -838,6 +847,7 @@ def main():
         "stm",
         "struct",
         "sys",
+        "termios",
         "time",
         "tpcalib",
         "uarray",

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/src/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.15.2
+This variant was generated from createstubs.py by micropython-stubber v1.16.2
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -39,7 +39,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.16.0"
+__version__ = "v1.16.2"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
@@ -448,13 +448,20 @@ def _info():  # type:() -> dict[str, str]
             "version": "",
             "build": "",
             "ver": "",
-            "port": "stm32" if sys.platform.startswith("pyb") else sys.platform,  # port: esp32 / win32 / linux / stm32
+            "port": sys.platform,  # port: esp32 / win32 / linux / stm32
             "board": "GENERIC",
             "cpu": "",
             "mpy": "",
             "arch": "",
         }
     )
+    # change port names to be consistent with the repo
+    if info["port"].startswith("pyb"):
+        info["port"] = "stm32"
+    elif info["port"] == "win32":
+        info["port"] = "windows"
+    elif info["port"] == "linux":
+        info["port"] = "unix"
     try:
         info["version"] = ".".join([str(n) for n in sys.implementation.version])
     except AttributeError:

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/src/stubber/board/createstubs_db_min.py

@@ -42,7 +42,7 @@ try:from machine import reset
 except P:pass
 try:from collections import OrderedDict as d
 except P:from ucollections import OrderedDict as d
-__version__='v1.16.0'
+__version__='v1.16.2'
 w=2
 x=2
 e=[J,'/lib','/sd/lib','/flash/lib','lib']
@@ -190,20 +190,23 @@ def U(s):
 	if A in s:s=s.split(A,1)[0]
 	return s.split('-')[1]if'-'in s else C
 def _info():
-	k='ev3-pybricks';j='pycom';i='pycopy';f='GENERIC';c='arch';b='cpu';a='ver';V='with';G='mpy';F='build';A=d({O:sys.implementation.name,D:C,F:C,a:C,'port':'stm32'if sys.platform.startswith('pyb')else sys.platform,K:f,b:C,G:C,c:C})
+	n='ev3-pybricks';m='pycom';l='pycopy';k='unix';j='win32';i='GENERIC';f='arch';c='cpu';b='ver';Y='with';I='mpy';G='port';F='build';A=d({O:sys.implementation.name,D:C,F:C,b:C,G:sys.platform,K:i,c:C,I:C,f:C})
+	if A[G].startswith('pyb'):A[G]='stm32'
+	elif A[G]==j:A[G]='windows'
+	elif A[G]=='linux':A[G]=k
 	try:A[D]=J.join([W(A)for A in sys.implementation.version])
 	except H:pass
-	try:Y=sys.implementation._machine if'_machine'in Q(sys.implementation)else os.uname().machine;A[K]=Y.strip();A[b]=Y.split(V)[1].strip();A[G]=sys.implementation._mpy if'_mpy'in Q(sys.implementation)else sys.implementation.mpy if G in Q(sys.implementation)else C
+	try:Z=sys.implementation._machine if'_machine'in Q(sys.implementation)else os.uname().machine;A[K]=Z.strip();A[c]=Z.split(Y)[1].strip();A[I]=sys.implementation._mpy if'_mpy'in Q(sys.implementation)else sys.implementation.mpy if I in Q(sys.implementation)else C
 	except(H,R):pass
 	B.collect()
-	for M in[A+'/board_info.csv'for A in e]:
-		if h(M):
-			I=A[K].strip()
-			if g(A,I,M):break
-			if V in I:
-				I=I.split(V)[0].strip()
-				if g(A,I,M):break
-			A[K]=f
+	for N in[A+'/board_info.csv'for A in e]:
+		if h(N):
+			M=A[K].strip()
+			if g(A,M,N):break
+			if Y in M:
+				M=M.split(Y)[0].strip()
+				if g(A,M,N):break
+			A[K]=i
 	A[K]=A[K].replace(' ',T);B.collect()
 	try:
 		A[F]=U(os.uname()[3])
@@ -211,20 +214,20 @@ def _info():
 		if not A[F]and';'in sys.version:A[F]=U(sys.version.split(';')[1])
 	except(H,R):pass
 	if A[F]and L(A[F])>5:A[F]=C
-	if A[D]==C and sys.platform not in('unix','win32'):
-		try:l=os.uname();A[D]=l.release
+	if A[D]==C and sys.platform not in(k,j):
+		try:o=os.uname();A[D]=o.release
 		except(R,H,TypeError):pass
-	for(m,n,o)in[(i,i,'const'),(j,j,'FAT'),(k,'pybricks.hubs','EV3Brick')]:
-		try:p=__import__(n,E,E,o);A[O]=m;del p;break
+	for(p,q,r)in[(l,l,'const'),(m,m,'FAT'),(n,'pybricks.hubs','EV3Brick')]:
+		try:s=__import__(q,E,E,r);A[O]=p;del s;break
 		except(P,S):pass
-	if A[O]==k:A['release']='2.0.0'
+	if A[O]==n:A['release']='2.0.0'
 	if A[O]==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]:
-		N=int(A[G]);Z=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][N>>10]
-		if Z:A[c]=Z
-		A[G]='v{}.{}'.format(N&255,N>>8&3)
-	A[a]=f"v{A[D]}-{A[F]}"if A[F]else f"v{A[D]}";return A
+	if I in A and A[I]:
+		V=int(A[I]);a=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][V>>10]
+		if a:A[f]=a
+		A[I]='v{}.{}'.format(V&255,V>>8&3)
+	A[b]=f"v{A[D]}-{A[F]}"if A[F]else f"v{A[D]}";return A
 def g(info,board_descr,filename):
 	with I(filename,'r')as B:
 		while 1:

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/src/stubber/board/createstubs_lvgl.py

@@ -3,7 +3,7 @@ Create stubs for the lvgl modules on a MicroPython board.
 
 Note that the stubs can be very large, and it may be best to directly store them on an SD card if your device supports this.
 
-This variant was generated from createstubs.py by micropython-stubber v1.15.2
+This variant was generated from createstubs.py by micropython-stubber v1.16.2
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -24,7 +24,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.15.2a0"
+__version__ = "v1.16.2"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
@@ -433,13 +433,20 @@ def _info():  # type:() -> dict[str, str]
             "version": "",
             "build": "",
             "ver": "",
-            "port": "stm32" if sys.platform.startswith("pyb") else sys.platform,  # port: esp32 / win32 / linux / stm32
+            "port": sys.platform,  # port: esp32 / win32 / linux / stm32
             "board": "GENERIC",
             "cpu": "",
             "mpy": "",
             "arch": "",
         }
     )
+    # change port names to be consistent with the repo
+    if info["port"].startswith("pyb"):
+        info["port"] = "stm32"
+    elif info["port"] == "win32":
+        info["port"] = "windows"
+    elif info["port"] == "linux":
+        info["port"] = "unix"
     try:
         info["version"] = ".".join([str(n) for n in sys.implementation.version])
     except AttributeError:

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/src/stubber/board/createstubs_lvgl_min.py

@@ -22,10 +22,10 @@ R=len
 Q=KeyError
 P=IndexError
 O=dir
-N=print
-M=ImportError
-L=True
-K='family'
+M=print
+N=ImportError
+K=True
+L='family'
 J='board'
 I='.'
 H=AttributeError
@@ -38,10 +38,10 @@ B=''
 import gc as C,os,sys
 from ujson import dumps as a
 try:from machine import reset
-except M:pass
+except N:pass
 try:from collections import OrderedDict as b
-except M:from ucollections import OrderedDict as b
-__version__='v1.15.2a0'
+except N:from ucollections import OrderedDict as b
+__version__='v1.16.2'
 u=2
 v=2
 w=[I,'/lib','/sd/lib','/flash/lib','lib']
@@ -54,7 +54,7 @@ class Stubber:
 		except H:pass
 		A._report=[];A.info=_info();C.collect()
 		if B:A._fwid=B.lower()
-		elif A.info[K]==l:A._fwid='{family}-{ver}-{port}-{board}'.format(**A.info)
+		elif A.info[L]==l: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:
@@ -62,7 +62,7 @@ class Stubber:
 		else:path=get_root()
 		A.path='{}/stubs/{}'.format(path,A.flat_fwid).replace('//',G)
 		try:c(path+G)
-		except F:N('error creating stub folder {}'.format(path))
+		except F:M('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):
 		I=item_instance;D=[];J=[]
@@ -97,29 +97,29 @@ class Stubber:
 		if H is E:O=D.replace(I,S)+'.py';H=J.path+G+O
 		else:O=H.split(G)[-1]
 		if G in D:D=D.replace(G,I)
-		K=E
-		try:K=__import__(D,E,E,'*');T=C.mem_free()
-		except M:return A
+		L=E
+		try:L=__import__(D,E,E,'*');T=C.mem_free()
+		except N:return A
 		c(H)
-		with V(H,'w')as N:P=str(J.info).replace('OrderedDict(',B).replace('})','}');R='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(D,J._fwid,P,__version__);N.write(R);N.write('from typing import Any\nfrom _typeshed import Incomplete\n\n');J.write_object_stub(N,K,D,B)
+		with V(H,'w')as M:P=str(J.info).replace('OrderedDict(',B).replace('})','}');R='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(D,J._fwid,P,__version__);M.write(R);M.write('from typing import Any\nfrom _typeshed import Incomplete\n\n');J.write_object_stub(M,L,D,B)
 		J._report.append('{{"module": "{}", "file": "{}"}}'.format(D,H.replace('\\',G)))
 		if D not in{'os','sys','logging','gc'}:
-			try:del K
+			try:del L
 			except(F,Q):pass
 			try:del sys.modules[D]
 			except Q:pass
-		C.collect();return L
+		C.collect();return K
 	def write_object_stub(K,fp,object_expr,obj_name,indent,in_class=0):
-		d='{0}{1} = {2} # type: {3}\n';c='bound_method';b='Incomplete';P=in_class;O=object_expr;M='Exception';H=fp;D=indent;C.collect()
+		d='{0}{1} = {2} # type: {3}\n';c='bound_method';b='Incomplete';P=in_class;O=object_expr;N='Exception';H=fp;D=indent;C.collect()
 		if O in K.problematic:return
 		S,L=K.get_obj_attributes(O)
-		if L:N(L)
+		if L:M(L)
 		for(E,J,G,T,f)in S:
-			if E in['classmethod','staticmethod','BaseException',M]:continue
+			if E in['classmethod','staticmethod','BaseException',N]:continue
 			if E[0].isdigit():continue
 			if G=="<class 'type'>"and R(D)<=v*4:
-				U=B;V=E.endswith(M)or E.endswith('Error')or E in['KeyboardInterrupt','StopIteration','SystemExit']
-				if V:U=M
+				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);K.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)
@@ -161,11 +161,11 @@ class Stubber:
 		G=s.format(B.path,filename);C.collect()
 		try:
 			with V(G,'w')as D:
-				B.write_json_header(D);E=L
+				B.write_json_header(D);E=K
 				for H in B._report:B.write_json_node(D,H,E);E=A
 				B.write_json_end(D)
 			I=B._start_free-C.mem_free()
-		except F:N('Failed to create the report.')
+		except F:M('Failed to create the report.')
 	def write_json_header(B,f):A='firmware';f.write('{');f.write(a({A:B.info})[1:-1]);f.write(Z);f.write(a({t:{D:__version__},'stubtype':A})[1:-1]);f.write(Z);f.write('"modules" :[\n')
 	def write_json_node(A,f,n,first):
 		if not first:f.write(Z)
@@ -181,7 +181,7 @@ def c(path):
 			except F as D:
 				if D.args[0]==u:
 					try:os.mkdir(B)
-					except F as E:N('failed to create folder {}'.format(B));raise E
+					except F as E:M('failed to create folder {}'.format(B));raise E
 		C=A+1
 def T(s):
 	A=' on '
@@ -189,20 +189,23 @@ def T(s):
 	if A in s:s=s.split(A,1)[0]
 	return s.split('-')[1]if'-'in s else B
 def _info():
-	h='ev3-pybricks';g='pycom';f='pycopy';c='GENERIC';a='arch';Z='cpu';Y='ver';V='with';G='mpy';F='build';A=b({K:sys.implementation.name,D:B,F:B,Y:B,'port':'stm32'if sys.platform.startswith('pyb')else sys.platform,J:c,Z:B,G:B,a:B})
+	k='ev3-pybricks';j='pycom';i='pycopy';h='unix';g='win32';f='GENERIC';c='arch';a='cpu';Z='ver';W='with';K='mpy';G='port';F='build';A=b({L:sys.implementation.name,D:B,F:B,Z:B,G:sys.platform,J:f,a:B,K:B,c:B})
+	if A[G].startswith('pyb'):A[G]='stm32'
+	elif A[G]==g:A[G]='windows'
+	elif A[G]=='linux':A[G]=h
 	try:A[D]=I.join([str(A)for A in sys.implementation.version])
 	except H:pass
-	try:W=sys.implementation._machine if'_machine'in O(sys.implementation)else os.uname().machine;A[J]=W.strip();A[Z]=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
+	try:X=sys.implementation._machine if'_machine'in O(sys.implementation)else os.uname().machine;A[J]=X.strip();A[a]=X.split(W)[1].strip();A[K]=sys.implementation._mpy if'_mpy'in O(sys.implementation)else sys.implementation.mpy if K in O(sys.implementation)else B
 	except(H,P):pass
 	C.collect()
-	for N in[A+'/board_info.csv'for A in w]:
-		if e(N):
-			L=A[J].strip()
-			if d(A,L,N):break
-			if V in L:
-				L=L.split(V)[0].strip()
-				if d(A,L,N):break
-			A[J]=c
+	for U in[A+'/board_info.csv'for A in w]:
+		if e(U):
+			M=A[J].strip()
+			if d(A,M,U):break
+			if W in M:
+				M=M.split(W)[0].strip()
+				if d(A,M,U):break
+			A[J]=f
 	A[J]=A[J].replace(' ',S);C.collect()
 	try:
 		A[F]=T(os.uname()[3])
@@ -210,27 +213,27 @@ def _info():
 		if not A[F]and';'in sys.version:A[F]=T(sys.version.split(';')[1])
 	except(H,P):pass
 	if A[F]and R(A[F])>5:A[F]=B
-	if A[D]==B and sys.platform not in('unix','win32'):
-		try:i=os.uname();A[D]=i.release
+	if A[D]==B and sys.platform not in(h,g):
+		try:m=os.uname();A[D]=m.release
 		except(P,H,TypeError):pass
-	for(j,k,m)in[(f,f,'const'),(g,g,'FAT'),(h,'pybricks.hubs','EV3Brick')]:
-		try:n=__import__(k,E,E,m);A[K]=j;del n;break
-		except(M,Q):pass
-	if A[K]==h:A['release']='2.0.0'
-	if A[K]==l:
+	for(n,o,p)in[(i,i,'const'),(j,j,'FAT'),(k,'pybricks.hubs','EV3Brick')]:
+		try:q=__import__(o,E,E,p);A[L]=n;del q;break
+		except(N,Q):pass
+	if A[L]==k:A['release']='2.0.0'
+	if A[L]==l:
 		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]);X=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][U>>10]
-		if X:A[a]=X
-		A[G]='v{}.{}'.format(U&255,U>>8&3)
-	A[Y]=f"v{A[D]}-{A[F]}"if A[F]else f"v{A[D]}";return A
+	if K in A and A[K]:
+		V=int(A[K]);Y=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][V>>10]
+		if Y:A[c]=Y
+		A[K]='v{}.{}'.format(V&255,V>>8&3)
+	A[Z]=f"v{A[D]}-{A[F]}"if A[F]else f"v{A[D]}";return A
 def d(info,board_descr,filename):
 	with V(filename,'r')as C:
 		while 1:
 			B=C.readline()
 			if not B:break
 			D,E=B.split(',')[0].strip(),B.split(',')[1].strip()
-			if D==board_descr:info[J]=E;return L
+			if D==board_descr:info[J]=E;return K
 	return A
 def get_root():
 	try:A=os.getcwd()
@@ -242,7 +245,7 @@ def get_root():
 	return B
 def e(filename):
 	try:
-		if os.stat(filename)[0]>>14:return L
+		if os.stat(filename)[0]>>14:return K
 		return A
 	except F:return A
 def f():sys.exit(1)
@@ -256,7 +259,7 @@ def read_path():
 	return path
 def g():
 	try:B=bytes('abc',encoding='utf8');C=g.__module__;return A
-	except(h,H):return L
+	except(h,H):return K
 def main():
 	D='lvgl'
 	try:import lvgl as A

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/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.15.2
+This variant was generated from createstubs.py by micropython-stubber v1.16.2
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -30,7 +30,7 @@ try:
 except ImportError:
     from ucollections import OrderedDict  # type: ignore
 
-__version__ = "v1.16.0"
+__version__ = "v1.16.2"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
@@ -439,13 +439,20 @@ def _info():  # type:() -> dict[str, str]
             "version": "",
             "build": "",
             "ver": "",
-            "port": "stm32" if sys.platform.startswith("pyb") else sys.platform,  # port: esp32 / win32 / linux / stm32
+            "port": sys.platform,  # port: esp32 / win32 / linux / stm32
             "board": "GENERIC",
             "cpu": "",
             "mpy": "",
             "arch": "",
         }
     )
+    # change port names to be consistent with the repo
+    if info["port"].startswith("pyb"):
+        info["port"] = "stm32"
+    elif info["port"] == "win32":
+        info["port"] = "windows"
+    elif info["port"] == "linux":
+        info["port"] = "unix"
     try:
         info["version"] = ".".join([str(n) for n in sys.implementation.version])
     except AttributeError:

{micropython_stubber-1.16.0 → micropython_stubber-1.16.2}/src/stubber/board/createstubs_mem_min.py

@@ -41,7 +41,7 @@ try:from machine import reset
 except O:pass
 try:from collections import OrderedDict as d
 except O:from ucollections import OrderedDict as d
-__version__='v1.16.0'
+__version__='v1.16.2'
 v=2
 w=2
 e=[I,'/lib','/sd/lib','/flash/lib','lib']
@@ -189,20 +189,23 @@ def U(s):
 	if A in s:s=s.split(A,1)[0]
 	return s.split('-')[1]if'-'in s else C
 def _info():
-	k='ev3-pybricks';j='pycom';i='pycopy';f='GENERIC';c='arch';b='cpu';a='ver';V='with';G='mpy';F='build';A=d({M:sys.implementation.name,D:C,F:C,a:C,'port':'stm32'if sys.platform.startswith('pyb')else sys.platform,J:f,b:C,G:C,c:C})
+	n='ev3-pybricks';m='pycom';l='pycopy';k='unix';j='win32';i='GENERIC';f='arch';c='cpu';b='ver';Y='with';K='mpy';G='port';F='build';A=d({M:sys.implementation.name,D:C,F:C,b:C,G:sys.platform,J:i,c:C,K:C,f:C})
+	if A[G].startswith('pyb'):A[G]='stm32'
+	elif A[G]==j:A[G]='windows'
+	elif A[G]=='linux':A[G]=k
 	try:A[D]=I.join([W(A)for A in sys.implementation.version])
 	except H:pass
-	try:Y=sys.implementation._machine if'_machine'in P(sys.implementation)else os.uname().machine;A[J]=Y.strip();A[b]=Y.split(V)[1].strip();A[G]=sys.implementation._mpy if'_mpy'in P(sys.implementation)else sys.implementation.mpy if G in P(sys.implementation)else C
+	try:Z=sys.implementation._machine if'_machine'in P(sys.implementation)else os.uname().machine;A[J]=Z.strip();A[c]=Z.split(Y)[1].strip();A[K]=sys.implementation._mpy if'_mpy'in P(sys.implementation)else sys.implementation.mpy if K in P(sys.implementation)else C
 	except(H,Q):pass
 	B.collect()
-	for N in[A+'/board_info.csv'for A in e]:
-		if h(N):
-			K=A[J].strip()
-			if g(A,K,N):break
-			if V in K:
-				K=K.split(V)[0].strip()
-				if g(A,K,N):break
-			A[J]=f
+	for R in[A+'/board_info.csv'for A in e]:
+		if h(R):
+			N=A[J].strip()
+			if g(A,N,R):break
+			if Y in N:
+				N=N.split(Y)[0].strip()
+				if g(A,N,R):break
+			A[J]=i
 	A[J]=A[J].replace(' ',T);B.collect()
 	try:
 		A[F]=U(os.uname()[3])
@@ -210,20 +213,20 @@ def _info():
 		if not A[F]and';'in sys.version:A[F]=U(sys.version.split(';')[1])
 	except(H,Q):pass
 	if A[F]and L(A[F])>5:A[F]=C
-	if A[D]==C and sys.platform not in('unix','win32'):
-		try:l=os.uname();A[D]=l.release
+	if A[D]==C and sys.platform not in(k,j):
+		try:o=os.uname();A[D]=o.release
 		except(Q,H,TypeError):pass
-	for(m,n,o)in[(i,i,'const'),(j,j,'FAT'),(k,'pybricks.hubs','EV3Brick')]:
-		try:p=__import__(n,E,E,o);A[M]=m;del p;break
+	for(p,q,r)in[(l,l,'const'),(m,m,'FAT'),(n,'pybricks.hubs','EV3Brick')]:
+		try:s=__import__(q,E,E,r);A[M]=p;del s;break
 		except(O,S):pass
-	if A[M]==k:A['release']='2.0.0'
+	if A[M]==n:A['release']='2.0.0'
 	if A[M]==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]:
-		R=int(A[G]);Z=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][R>>10]
-		if Z:A[c]=Z
-		A[G]='v{}.{}'.format(R&255,R>>8&3)
-	A[a]=f"v{A[D]}-{A[F]}"if A[F]else f"v{A[D]}";return A
+	if K in A and A[K]:
+		V=int(A[K]);a=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][V>>10]
+		if a:A[f]=a
+		A[K]='v{}.{}'.format(V&255,V>>8&3)
+	A[b]=f"v{A[D]}-{A[F]}"if A[F]else f"v{A[D]}";return A
 def g(info,board_descr,filename):
 	with R(filename,'r')as C:
 		while 1: