micropython-stubber 1.13.6__py3-none-any.whl → 1.13.8__py3-none-any.whl

stubber/board/createstubs_min.py

@@ -20,12 +20,12 @@ Y='tuple'
 X='micropython'
 W=open
 V=repr
-T=KeyError
-S=IndexError
-R=dir
-Q=ImportError
-P=True
-O='_'
+T='_'
+S=KeyError
+R=IndexError
+Q=dir
+P=ImportError
+O=True
 N='family'
 M=len
 L='.'
@@ -41,10 +41,10 @@ B=''
 import gc as C,sys,uos as os
 from ujson import dumps as c
 try:from machine import reset
-except Q:pass
+except P:pass
 try:from collections import OrderedDict as d
-except Q:from ucollections import OrderedDict as d
-__version__='v1.13.4'
+except P:from ucollections import OrderedDict as d
+__version__='v1.13.8'
 x=2
 y=2
 z=[L,'/lib','/sd/lib','/flash/lib','lib']
@@ -68,21 +68,21 @@ class Stubber:
 		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):
-		H=item_instance;A=[];J=[]
-		for D in R(H):
-			if D.startswith(O):continue
+		H=item_instance;D=[];J=[]
+		for A in Q(H):
+			if A.startswith(T)and not A in L.modules:continue
 			try:
-				E=getattr(H,D)
+				E=getattr(H,A)
 				try:F=V(type(E)).split("'")[1]
-				except S:F=B
+				except R:F=B
 				if F in{n,o,p,q,Y,Z,a}:G=1
 				elif F in{r,s}:G=2
 				elif F in'class':G=3
 				else:G=4
-				A.append((D,V(E),V(type(E)),E,G))
-			except I as K:J.append("Couldn't get attribute '{}' from object '{}', Err: {}".format(D,H,K))
+				D.append((A,V(E),V(type(E)),E,G))
+			except I as K:J.append("Couldn't get attribute '{}' from object '{}', Err: {}".format(A,H,K))
 			except MemoryError as K:sleep(1);reset()
-		A=k([A for A in A if not A[0].startswith(O)],key=lambda x:x[4]);C.collect();return A,J
+		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))
 	def create_all_stubs(A):
 		C.collect()
@@ -97,27 +97,27 @@ class Stubber:
 		C.collect();return D
 	def create_module_stub(I,module_name,file_name=E):
 		D=file_name;A=module_name
-		if D is E:K=A.replace(L,O)+'.py';D=I.path+G+K
+		if D is E:K=A.replace(L,T)+'.py';D=I.path+G+K
 		else:K=D.split(G)[-1]
 		if G in A:A=A.replace(G,L)
 		M=E
-		try:M=__import__(A,E,E,'*');R=C.mem_free();J('Stub module: {:<25} to file: {:<70} mem:{:>5}'.format(A,K,R))
-		except Q:return H
+		try:M=__import__(A,E,E,'*');Q=C.mem_free();J('Stub module: {:<25} to file: {:<70} mem:{:>5}'.format(A,K,Q))
+		except P:return H
 		e(D)
-		with W(D,'w')as N:S='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(A,I._fwid,I.info,__version__);N.write(S);N.write('from typing import Any\n\n');I.write_object_stub(N,M,A,B)
+		with W(D,'w')as N:R='"""\nModule: \'{0}\' on {1}\n"""\n# MCU: {2}\n# Stubber: {3}\n'.format(A,I._fwid,I.info,__version__);N.write(R);N.write('from typing import Any\n\n');I.write_object_stub(N,M,A,B)
 		I._report.append('{{"module": "{}", "file": "{}"}}'.format(A,D.replace('\\',G)))
 		if A not in{'os',t,u,'gc'}:
 			try:del M
-			except (F,T):pass
+			except (F,S):pass
 			try:del sys.modules[A]
-			except T:pass
-		C.collect();return P
+			except S:pass
+		C.collect();return O
 	def write_object_stub(L,fp,object_expr,obj_name,indent,in_class=0):
 		d='{0}{1} = {2} # type: {3}\n';c='bound_method';b='Any';Q=in_class;P=object_expr;O='Exception';H=fp;D=indent;C.collect()
 		if P in L.problematic:return
 		R,N=L.get_obj_attributes(P)
 		if N:J(N)
-		for (E,K,G,S,f) in R:
+		for (E,K,G,T,f) in R:
 			if E in['classmethod','staticmethod','BaseException',O]:continue
 			if E[0].isdigit():continue
 			if G=="<class 'type'>"and M(D)<=y*4:
@@ -125,7 +125,7 @@ class Stubber:
 				if V:U=O
 				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,S,'{0}.{1}'.format(obj_name,E),D+'    ',Q+1);A=D+'    def __init__(self, *argv, **kwargs) -> None:\n';A+=D+'        ...\n\n';H.write(A)
+				H.write(A);L.write_object_stub(H,T,'{0}.{1}'.format(obj_name,E),D+'    ',Q+1);A=D+'    def __init__(self, *argv, **kwargs) -> None:\n';A+=D+'        ...\n\n';H.write(A)
 			elif s in G or r in G:
 				W=b;X=B
 				if Q>0:X='self, '
@@ -143,12 +143,12 @@ class Stubber:
 				H.write(A)
 			else:H.write("# all other, type = '{0}'\n".format(G));H.write(D+E+' # type: Any\n')
 		del R;del N
-		try:del E,K,G,S
-		except (F,T,l):pass
+		try:del E,K,G,T
+		except (F,S,l):pass
 	@property
 	def flat_fwid(self):
 		A=self._fwid;B=' .()/\\:$'
-		for C in B:A=A.replace(C,O)
+		for C in B:A=A.replace(C,T)
 		return A
 	def clean(B,path=E):
 		if path is E:path=B.path
@@ -165,7 +165,7 @@ class Stubber:
 		J('Created stubs for {} modules on board {}\nPath: {}'.format(M(A._report),A._fwid,A.path));E=v.format(A.path,filename);C.collect()
 		try:
 			with W(E,'w')as B:
-				A.write_json_header(B);D=P
+				A.write_json_header(B);D=O
 				for G in A._report:A.write_json_node(B,G,D);D=H
 				A.write_json_end(B)
 			I=A._start_free-C.mem_free()
@@ -196,8 +196,8 @@ def _info():
 	i='ev3-pybricks';h='pycopy';e='GENERIC';c='arch';a='cpu';Z='ver';V='with';G='mpy';F='build';A=d({N:sys.implementation.name,D:B,F:B,Z:B,m:'stm32'if sys.platform.startswith(w)else sys.platform,K:e,a:B,G:B,c:B})
 	try:A[D]=L.join([str(A)for A in sys.implementation.version])
 	except I:pass
-	try:W=sys.implementation._machine if'_machine'in R(sys.implementation)else os.uname().machine;A[K]=W.strip();A[a]=W.split(V)[1].strip();A[G]=sys.implementation._mpy if'_mpy'in R(sys.implementation)else sys.implementation.mpy if G in R(sys.implementation)else B
-	except (I,S):pass
+	try:W=sys.implementation._machine if'_machine'in Q(sys.implementation)else os.uname().machine;A[K]=W.strip();A[a]=W.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 B
+	except (I,R):pass
 	C.collect()
 	for J in [A+'/board_info.csv'for A in z]:
 		if g(J):
@@ -207,26 +207,26 @@ def _info():
 				H=H.split(V)[0].strip()
 				if f(A,H,J):break
 			A[K]=e
-	A[K]=A[K].replace(' ',O);C.collect()
+	A[K]=A[K].replace(' ',T);C.collect()
 	try:
 		A[F]=U(os.uname()[3])
 		if not A[F]:A[F]=U(os.uname()[2])
 		if not A[F]and';'in sys.version:A[F]=U(sys.version.split(';')[1])
-	except (I,S):pass
+	except (I,R):pass
 	if A[F]and M(A[F])>5:A[F]=B
 	if A[D]==B and sys.platform not in('unix','win32'):
 		try:j=os.uname();A[D]=j.release
-		except (S,I,TypeError):pass
+		except (R,I,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[N]=k;del o;break
-		except (Q,T):pass
+		except (P,S):pass
 	if A[N]==i:A['release']='2.0.0'
 	if A[N]==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]:
-		P=int(A[G]);Y=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][P>>10]
+		O=int(A[G]);Y=[E,'x86','x64','armv6','armv6m','armv7m','armv7em','armv7emsp','armv7emdp','xtensa','xtensawin'][O>>10]
 		if Y:A[c]=Y
-		A[G]='v{}.{}'.format(P&255,P>>8&3)
+		A[G]='v{}.{}'.format(O&255,O>>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):
 	with W(filename,'r')as B:
@@ -234,7 +234,7 @@ def f(info,board_descr,filename):
 			A=B.readline()
 			if not A:break
 			C,D=A.split(',')[0].strip(),A.split(',')[1].strip()
-			if C==board_descr:info[K]=D;return P
+			if C==board_descr:info[K]=D;return O
 	return H
 def get_root():
 	try:A=os.getcwd()
@@ -246,7 +246,7 @@ def get_root():
 	return B
 def g(filename):
 	try:
-		if os.stat(filename)[0]>>14:return P
+		if os.stat(filename)[0]>>14:return O
 		return H
 	except F:return H
 def h():sys.exit(1)
@@ -260,7 +260,7 @@ def read_path():
 	return path
 def i():
 	try:A=bytes('abc',encoding='utf8');B=i.__module__;return H
-	except (j,I):return P
+	except (j,I):return O
 def main():stubber=Stubber(path=read_path());stubber.clean();stubber.modules=['WM8960','_OTA','_boot_fat','_coap','_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','ak8963','apa102','apa106','array','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','dht','display','display_driver_utils','ds18x20','encoder','errno','esp','esp32','espidf','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',X,'mip','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)

stubber/codemod/board.py

@@ -15,7 +15,7 @@ from packaging.version import Version
 from stubber.codemod._partials import Partial
 from stubber.codemod.modify_list import ListChangeSet, ModifyListElements
 from stubber.cst_transformer import update_module_docstr
-from stubber.utils.my_version import __version__
+from stubber import __version__
 
 # matches on `stubber = Stubber()`
 _STUBBER_MATCHER = m.Assign(

stubber/commands/cli.py

@@ -5,7 +5,7 @@ import sys
 
 import click
 from loguru import logger as log
-from stubber.utils.my_version import __version__
+from stubber import __version__
 
 
 @click.group(chain=True)

stubber/commands/switch_cmd.py

@@ -2,10 +2,12 @@
 switch to a specific version of the micropython repos
 """
 
+
 from pathlib import Path
 from typing import Optional, Union
 
 import click
+
 import stubber.basicgit as git
 from stubber.utils.config import CONFIG
 from stubber.utils.repos import fetch_repos, repo_paths
@@ -18,7 +20,12 @@ from .cli import stubber_cli
 
 
 # get version list from Git tags in the repo that is provided on the command line
-VERSION_LIST = git.get_tags("micropython/micropython", minver="v1.9.3") + ["latest"]
+
+try:
+    VERSION_LIST = git.get_tags("micropython/micropython", minver="v1.9.3") + ["latest"]
+except Exception:
+    # offline fallback
+    VERSION_LIST = ["v1.91.1", "v1.20.0", "latest"]
 
 
 @stubber_cli.command(name="switch")

stubber/data/micropython_tags.csv

@@ -12,4 +12,4 @@ version,            mpy_date,      lib_date,      lib_commit_hash,
 "refs/tags/v1.18",  "Jan 16 2022", "Nov 11 2021", "cdd260f0792d04a1ded99171b4c7a2582b7856b4",  "aioble/multitests: Add multitest for shutdown handlers."
 "refs/tags/v1.19",  "Jun 16 2022", "Jun 16 2022", "db4c739863e49fc874bdaae8aa8c316c7ed4276a",  "unittest: Version 0.9.0"
 "refs/tags/v1.19.1","Jun 16 2022", "Jun 16 2022", "db4c739863e49fc874bdaae8aa8c316c7ed4276a",  "unittest: Version 0.9.0"
-"refs/tags/v1.20.0","Apr 26 2023", "Apr 11 2023", "c113611765278b2fc8dcf8b2f2c3513b35a69b39",  "aioble: Fix descriptor flag handling"
+

stubber/get_cpython.py

@@ -14,7 +14,9 @@ from typing import Optional, Union
 
 from loguru import logger as log
 
-from . import __version__, utils
+from . import __version__
+
+from . import utils
 from .utils.config import CONFIG
 
 # # log = logging.getLogger(__name__)

stubber/publish/enums.py

@@ -14,6 +14,14 @@ class StubSource(str, Enum):
     MERGED = "Merged stubs"
     "stubs built by merging the information from doc-stubs and firmware-stubs"
 
+    def __str__(self):
+        # Always force string values
+        return self.value
+
+    def __repr__(self):
+        # Always force string values
+        return self.value
+
 
 ALL_TYPES = ["combo", "doc", "core", "firmware"]
 COMBO_STUBS = ALL_TYPES[0]

stubber/publish/merge_docstubs.py

@@ -30,7 +30,7 @@ def board_folder_name(fw: Dict, *, version: Optional[str] = None):
     base = get_base(fw, version=version)
     folder_name = f"{base}-{fw['port']}" if fw["board"] in GENERIC else f"{base}-{fw['port']}-{fw['board']}"
     # do not force name to lowercase
-    folder_name = folder_name.replace("-generic_", "-")  # @GENERIC Prefix
+    folder_name = folder_name.replace("-generic_", "-").replace("-GENERIC_", "-")  # remove GENERIC Prefix
     return folder_name
 
 
@@ -86,7 +86,9 @@ def merge_all_docstubs(
             if candidate["version"] == "latest":
                 # for the latest we do a bit more effort to get something 'good enough'
                 # try to get the board_path from the last released version as the basis
-                board_path = CONFIG.stub_path / board_folder_name(candidate, version=clean_version(CONFIG.stable_version, flat=True))
+                board_path = CONFIG.stub_path / board_folder_name(
+                    candidate, version=clean_version(CONFIG.stable_version, flat=True)
+                )
                 # check again
                 if board_path.exists():
                     log.info(f"using {board_path.name} as the basis for {merged_path.name}")
@@ -101,7 +103,7 @@ def merge_all_docstubs(
         log.info(f"Merge docstubs for {merged_path.name} {candidate['version']}")
         result = copy_and_merge_docstubs(board_path, merged_path, doc_path)
         # Add methods from docstubs to the firmware stubs that do not exist in the firmware stubs
-        add_machine_pin_call(merged_path, candidate['version'])
+        add_machine_pin_call(merged_path, candidate["version"])
         if result:
             merged += 1
     log.info(f"merged {merged} of {len(candidates)} candidates")

stubber/publish/publish.py

@@ -4,14 +4,14 @@ prepare a set of stub files for publishing to PyPi
 !!Note: anything excluded in .gitignore is not packaged by poetry
 """
 from typing import Any, Dict, List, Union
+
 from loguru import logger as log
 
 from stubber.publish.candidates import board_candidates, filter_list
 from stubber.publish.database import get_database
 from stubber.publish.enums import COMBO_STUBS
-from stubber.publish.package import get_package
+from stubber.publish.package import GENERIC_U, get_package
 from stubber.utils.config import CONFIG
-from stubber.publish.package import GENERIC_U
 
 
 def build_multiple(
@@ -74,7 +74,9 @@ def publish_multiple(
     return results
 
 
-def build_worklist(family: str, versions: List[str], ports: Union[List[str], str], boards: Union[List[str], str]):
+def build_worklist(
+    family: str, versions: Union[List[str], str], ports: Union[List[str], str], boards: Union[List[str], str]
+):
     """Build a worklist of packages to build or publish, and filter to only the requested ports and boards"""
     if isinstance(versions, str):
         versions = [versions]

stubber/publish/stubpacker.py

@@ -148,7 +148,6 @@ class StubPackage:
             with open(_toml, "rb") as f:
                 pyproject = tomllib.load(f)
             pyproject["tool"]["poetry"]["version"] = version
-
             # update the version in the toml file
             with open(_toml, "wb") as output:
                 tomli_w.dump(pyproject, output)
@@ -174,13 +173,15 @@ class StubPackage:
         else:
             raise ValueError("cannot determine next version number micropython")
 
-    def get_next_package_version(self, prod: bool = False) -> str:
+    def get_next_package_version(self, prod: bool = False, rc=False) -> str:
         """Get the next version for the package."""
         base = Version(self.pkg_version)
         if pypi_versions := get_pypi_versions(self.package_name, production=prod, base=base):
+            # get the latest version from pypi
             self.pkg_version = str(pypi_versions[-1])
-        # no puvblished package found , so we start at base version then bump 1 post release
-        self.pkg_version = Version(self.pkg_version).base_version
+        else:
+            # no published package found , so we start at base version then bump 1 post release
+            self.pkg_version = Version(self.pkg_version).base_version
         return self.bump()
 
     # -----------------------------------------------
@@ -666,8 +667,7 @@ class StubPackage:
         ok = self.update_package()
         self.status["version"] = self.pkg_version
         if not ok:
-            log.warning(f"{self.package_name}: skipping as build failed")
-            self.status["error"] = "Build failed"
+            log.info(f"{self.package_name}: skip - Could not update package")
             return False
         # If there are changes to the package, then publish it
         if self.is_changed():
@@ -691,7 +691,7 @@ class StubPackage:
                 self.status["result"] = "Build OK"
             else:
                 log.warning(f"{self.package_name}: skipping as build failed")
-                self.status["error"] = "Build failed"
+                self.status["error"] = "Poetry build failed"
                 return False
         return True
 

stubber/rst/lookup.py

@@ -101,7 +101,7 @@ LOOKUP_LIST = {
     "machine.UART.irq": ("Any", 0.95),  # no IRQ type defined
     "math.isnan": ("bool", 0.95),
     "micropython.opt_level": ("Any", 0.95),  # Not clear in docstring
-    "micropython.const": ("int", 0.95),  # const is always an int
+    "micropython.const": ("Union[int, bytes, str, Tuple]", 0.95),  # since 1.19 can also be string , bytes or tuple 
     "pyb.hard_reset": ("NoReturn", 0.95),  # never returns
     "pyb.I2C.recv": ("bytes", 0.95),  # complex in docstring
     "pyb.SPI.recv": ("bytes", 0.95),  # complex in docstring

stubber/utils/manifest.py

@@ -5,7 +5,7 @@ import os
 from pathlib import Path
 from typing import Optional
 
-from .my_version import __version__
+from .. import __version__
 from .versions import clean_version
 
 # # log = logging.getLogger(__name__)

stubber/utils/repos.py

@@ -8,9 +8,10 @@ from collections import defaultdict
 from pathlib import Path
 from typing import Tuple
 
-import stubber.basicgit as git
 from loguru import logger as log
+from packaging.version import Version
 
+import stubber.basicgit as git
 from stubber.utils.config import CONFIG
 
 # # log = logging.getLogger(__name__)
@@ -43,13 +44,11 @@ def switch(tag: str, *, mpy_path: Path, mpy_lib_path: Path):
 
 def read_micropython_lib_commits(filename: str = "data/micropython_tags.csv"):
     """
-    Read a csv with the micropython version and matchin micropython-lib commit-hashes
+    Read a csv with the micropython version and matching micropython-lib commit-hashes
     these can be used to make sure that the correct micropython-lib version is checked out.
 
     filename is relative to the 'stubber' package
 
-    TODO: it would be nice if micropython-lib had matching commit-tags
-
         git for-each-ref --sort=creatordate --format '%(refname) %(creatordate)' refs/tags
     """
     data = pkgutil.get_data("stubber", filename)
@@ -63,7 +62,9 @@ def read_micropython_lib_commits(filename: str = "data/micropython_tags.csv"):
         reader = csv.DictReader(ntf.file, skipinitialspace=True)  # dialect="excel",
         rows = list(reader)
         # create a dict version --> commit_hash
-        version_commit = {row["version"].split("/")[-1]: row["lib_commit_hash"] for row in rows if row["version"].startswith("refs/tags/")}
+        version_commit = {
+            row["version"].split("/")[-1]: row["lib_commit_hash"] for row in rows if row["version"].startswith("refs/tags/")
+        }
     # add default
     version_commit = defaultdict(lambda: "master", version_commit)
     return version_commit
@@ -72,12 +73,24 @@ def read_micropython_lib_commits(filename: str = "data/micropython_tags.csv"):
 def match_lib_with_mpy(version_tag: str, lib_path: Path):
     micropython_lib_commits = read_micropython_lib_commits()
     # Make sure that the correct micropython-lib release is checked out
-    log.info(f"Matching repo's:  Micropython {version_tag} needs micropython-lib:{micropython_lib_commits[version_tag]}")
-    return git.checkout_commit(micropython_lib_commits[version_tag], lib_path)
+    #  check if micropython-lib has matching tags
+    if Version(version_tag) >= Version("v1.20.0"):
+        # TODO:if version is v1.12.0 or newer
+        #   then use submodules to checkout the correct version of micropython-lib
+        #   git submodule update lib/micropython-lib
+        #   or use the new git tags to checkout the correct version of micropython-lib
+        # else
+        # clean the submodules for just to be sure
+        #   git submodule foreach --recursive git clean -xfd
+        #   use the micropython_tags.csv to find the correct commit hash
+        return git.checkout_tag(version_tag, lib_path)
+    else:
+        log.info(f"Matching repo's:  Micropython {version_tag} needs micropython-lib:{micropython_lib_commits[version_tag]}")
+        return git.checkout_commit(micropython_lib_commits[version_tag], lib_path)
 
 
 def fetch_repos(tag: str, mpy_path: Path, mpy_lib_path: Path):
-    """Fetch updates , then switch to the provided tag"""
+    """Fetch updates, then switch to the provided tag"""
     log.info("fetch updates")
     git.fetch(mpy_path)
     git.fetch(mpy_lib_path)
@@ -96,7 +109,7 @@ def fetch_repos(tag: str, mpy_path: Path, mpy_lib_path: Path):
         git.checkout_tag(repo=mpy_path, tag=tag)
     result = match_lib_with_mpy(version_tag=tag, lib_path=mpy_lib_path)
 
-    log.info(f"{mpy_lib_path} {git.get_local_tag(mpy_path)}")
+    log.info(f"{mpy_path} {git.get_local_tag(mpy_path)}")
     log.info(f"{mpy_lib_path} {git.get_local_tag(mpy_lib_path)}")
     return result
 

stubber/utils/my_version.py

@@ -1,15 +0,0 @@
-"""
-find the version of this package
-"""
-
-try:
-    import importlib.metadata as importlib_metadata
-except ModuleNotFoundError:  # pragma: no cover
-    import importlib_metadata  # type: ignore
-
-__version__ = "0.0.0"
-try:
-    # todo: use __name__
-    __version__ = importlib_metadata.version("micropython-stubber")
-except Exception:  # pragma: no cover
-    __version__ = "0.0.0"