Fix: Allow checkkout with missing tag

Josverl · Josverl · commit 7dfa01b78ddf · 2024-01-26T23:17:15.000+01:00
Bump version to 1.16.3

Signed-off-by: Jos Verlinde &lt;jos_verlinde@hotmail.com&gt;
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ repo-path = "./repos"
 
 [tool.poetry]
 name = "micropython-stubber"
-version = "1.16.2"
+version = "1.16.3"
 description = "Tooling to create and maintain stubs for MicroPython"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
diff --git a/scripts/get_firmwares.ipynb b/scripts/get_firmwares.ipynb
diff --git a/src/stubber/__init__.py b/src/stubber/__init__.py
@@ -1,4 +1,4 @@
 """get the version"""
 
 
-__version__ = "1.16.2"
+__version__ = "1.16.3"
diff --git a/src/stubber/basicgit.py b/src/stubber/basicgit.py
@@ -42,7 +42,7 @@ def _run_local_git(
         return None
     except subprocess.CalledProcessError as e:  # pragma: no cover
         # add some logging for github actions
-        log.error(f"{str(e)} : { e.stderr.decode('utf-8')}")
+        log.error(f"{str(e)} : { e.stderr}")
         return None
     if result.stderr and result.stderr != b"":
         stderr = result.stderr
@@ -150,7 +150,7 @@ def checkout_tag(tag: str, repo: Optional[Union[str, Path]] = None) -> bool:
     """
     checkout a specific git tag
     """
-    cmd = ["git", "checkout", "tags/" + tag, "--detach", "--quiet", "--force"]
+    cmd = ["git", "checkout", tag, "--quiet", "--force"]
     result = _run_local_git(cmd, repo=repo, expect_stderr=True, capture_output=True)
     if not result:
         return False
diff --git a/src/stubber/board/createstubs.py b/src/stubber/board/createstubs.py
@@ -25,7 +25,7 @@
     from ucollections import OrderedDict  # type: ignore
 
 
-__version__ = "v1.16.2"
+__version__ = "v1.16.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
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.16.2
+This variant was generated from createstubs.py by micropython-stubber v1.16.3
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -59,7 +59,7 @@ def feed(self):
 
 wdt.feed()
 
-__version__ = "v1.16.2"
+__version__ = "v1.16.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/board/createstubs_db_min.py b/src/stubber/board/createstubs_db_min.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.16.2
+This variant was generated from createstubs.py by micropython-stubber v1.16.3
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -59,7 +59,7 @@ def feed(self):
 
 wdt.feed()
 
-__version__ = "v1.16.2"
+__version__ = "v1.16.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
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.16.2
+This variant was generated from createstubs.py by micropython-stubber v1.16.3
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -50,7 +50,7 @@ def feed(self):
 
 wdt.feed()
 
-__version__ = "v1.16.2"
+__version__ = "v1.16.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/board/createstubs_mem_min.py b/src/stubber/board/createstubs_mem_min.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.16.2
+This variant was generated from createstubs.py by micropython-stubber v1.16.3
 """
 # Copyright (c) 2019-2023 Jos Verlinde
 
@@ -50,7 +50,7 @@ def feed(self):
 
 wdt.feed()
 
-__version__ = "v1.16.2"
+__version__ = "v1.16.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/board/createstubs_min.py b/src/stubber/board/createstubs_min.py
@@ -40,7 +40,7 @@ def feed(self):
 
 wdt.feed()
 
-__version__ = "v1.16.2"
+__version__ = "v1.16.3"
 ENOENT = 2
 _MAX_CLASS_LEVEL = 2  # Max class nesting
 LIBS = [".", "/lib", "/sd/lib", "/flash/lib", "lib"]
diff --git a/src/stubber/utils/repos.py b/src/stubber/utils/repos.py
@@ -88,8 +88,10 @@ def match_lib_with_mpy(version_tag: str, mpy_path: Path, lib_path: Path) -> bool
         # micropython-lib is now a submodule
         result = git.checkout_tag(version_tag, lib_path)
         if not result:
-            log.error("Could not checkout micropython-lib @master")
-            return False
+            log.warning(f"Could not checkout micropython-lib @{version_tag}")
+            if not git.checkout_tag("master", lib_path):
+                log.error("Could not checkout micropython-lib @master")
+                return False
         return git.sync_submodules(mpy_path)
     else:
         log.info(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`"""get the version"""`
`2`	`2`
`3`	`3`
`4`		`-__version__ = "1.16.2"`
	`4`	`+__version__ = "1.16.3"`