micropython-stubber 1.23.2__tar.gz → 1.23.3__tar.gz

{micropython_stubber-1.23.2 → micropython_stubber-1.23.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micropython-stubber
-Version: 1.23.2
+Version: 1.23.3
 Summary: Tooling to create and maintain stubs for MicroPython
 Home-page: https://github.com/Josverl/micropython-stubber#readme
 License: MIT
@@ -26,7 +26,7 @@ Requires-Dist: executing (>=2.0.1,<3.0.0)
 Requires-Dist: importlib-metadata (>=1,<9) ; python_version < "3.8"
 Requires-Dist: libcst (>=1.1.0,<2.0.0)
 Requires-Dist: loguru (>=0.6,<0.8)
-Requires-Dist: mpflash (>=1.0.2,<2.0.0)
+Requires-Dist: mpflash (>=1.0.5,<2.0.0)
 Requires-Dist: mpremote (>=1.23.0,<2.0.0)
 Requires-Dist: mypy (==1.10.1)
 Requires-Dist: mypy-gitlab-code-quality (>=1.1.0,<2.0.0)
@@ -37,7 +37,7 @@ Requires-Dist: pypi-simple (>=1.0.0,<2.0.0)
 Requires-Dist: pyright (>=1.1.341,<2.0.0)
 Requires-Dist: pyserial (>=3.5,<4.0)
 Requires-Dist: pysondb-v2 (>=2.1.0,<3.0.0)
-Requires-Dist: python-minifier (>=2.7.0,<3.0.0) ; python_version < "3.12"
+Requires-Dist: python-minifier (>=2.7.0,<3.0.0) ; python_version < "3.14"
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: rich-click (>=1.8.3,<2.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)

{micropython_stubber-1.23.2 → micropython_stubber-1.23.3}/pyproject.toml

@@ -8,7 +8,7 @@ repo-path = "./repos"
 
 [tool.poetry]
 name = "micropython-stubber"
-version = "1.23.2"
+version = "1.23.3"
 description = "Tooling to create and maintain stubs for MicroPython"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
@@ -48,10 +48,10 @@ mpremote = "mpremote.main:main"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4.0"
-python-minifier = { version = "^2.7.0", python = "<3.12" } # no support for 3.12 yet
+python-minifier = { version = "^2.7.0", python = "<3.14" }
 requests = "^2.32.3"
 mypy = "1.10.1"
-mpflash = "^1.0.2"
+mpflash = "^1.0.5"
 mpremote = "^1.23.0"
 # others
 autoflake = ">=1.7,<3.0"

{micropython_stubber-1.23.2 → micropython_stubber-1.23.3}/src/mpflash/mpflash/basicgit.py

@@ -10,7 +10,7 @@ from pathlib import Path
 from typing import List, Optional, Union
 
 import cachetools.func
-from github import Auth, Github
+from github import Auth, BadCredentialsException, Github
 from loguru import logger as log
 from packaging.version import parse
 
@@ -18,7 +18,11 @@ from packaging.version import parse
 
 # Token with no permissions to avoid throttling
 # https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#getting-a-higher-rate-limit
-PAT_NO_ACCESS = "github_pat" + "_11AAHPVFQ0qAkDnSUaMKSp" + "_ZkDl5NRRwBsUN6EYg9ahp1Dvj4FDDONnXVgimxC2EtpY7Q7BUKBoQ0Jq72X"
+PAT_NO_ACCESS = (
+    "github_pat_"
+    + "11AAHPVFQ0G4NTaQ73Bw5J"
+    + "_fAp7K9sZ1qL8VFnI9g78eUlCdmOXHB3WzSdj2jtEYb4XF3N7PDJBl32qIxq"
+)
 PAT = os.environ.get("GITHUB_TOKEN") or PAT_NO_ACCESS
 GH_CLIENT = Github(auth=Auth.Token(PAT))
 
@@ -35,9 +39,17 @@ def _run_local_git(
         if repo:
             if isinstance(repo, str):
                 repo = Path(repo)
-            result = subprocess.run(cmd, capture_output=capture_output, check=True, cwd=repo.absolute().as_posix(), encoding="utf-8")
+            result = subprocess.run(
+                cmd,
+                capture_output=capture_output,
+                check=True,
+                cwd=repo.absolute().as_posix(),
+                encoding="utf-8",
+            )
         else:
-            result = subprocess.run(cmd, capture_output=capture_output, check=True, encoding="utf-8")
+            result = subprocess.run(
+                cmd, capture_output=capture_output, check=True, encoding="utf-8"
+            )
     except (NotADirectoryError, FileNotFoundError) as e:  # pragma: no cover
         return None
     except subprocess.CalledProcessError as e:  # pragma: no cover
@@ -76,7 +88,9 @@ def clone(remote_repo: str, path: Path, shallow: bool = False, tag: Optional[str
         return False
 
 
-def get_local_tag(repo: Optional[Union[str, Path]] = None, abbreviate: bool = True) -> Union[str, None]:
+def get_local_tag(
+    repo: Optional[Union[str, Path]] = None, abbreviate: bool = True
+) -> Union[str, None]:
     """
     get the most recent git version tag of a local repo
     repo Path should be in the form of : repo = "./repo/micropython"
@@ -125,12 +139,16 @@ def get_local_tags(repo: Optional[Path] = None, minver: Optional[str] = None) ->
 @cachetools.func.ttl_cache(maxsize=16, ttl=60)  # 60 seconds
 def get_tags(repo: str, minver: Optional[str] = None) -> List[str]:
     """
-    Get list of tag of a repote github repo
+    Get list of tag of a repote github repo.
+    only the last -preview tag is kept
     """
     if not repo or not isinstance(repo, str) or "/" not in repo:  # type: ignore
         return []
     try:
         gh_repo = GH_CLIENT.get_repo(repo)
+    except BadCredentialsException as e:
+        log.error(f"Github authentication error - {e}")
+        return []
     except ConnectionError as e:
         # TODO: unable to capture the exeption
         log.warning(f"Unable to get tags - {e}")
@@ -138,7 +156,9 @@ def get_tags(repo: str, minver: Optional[str] = None) -> List[str]:
     tags = [tag.name for tag in gh_repo.get_tags()]
     if minver:
         tags = [tag for tag in tags if parse(tag) >= parse(minver)]
-    return sorted(tags)
+    # remove all but the last preview
+    tags = [t for t in sorted(tags[:-1]) if "-preview" not in t] + sorted(tags)[-1:]
+    return tags
 
 
 def checkout_tag(tag: str, repo: Optional[Union[str, Path]] = None) -> bool:

{micropython_stubber-1.23.2 → micropython_stubber-1.23.3}/src/mpflash/mpflash/common.py

@@ -30,11 +30,8 @@ PORT_FWTYPES = {
 
 # Token with no permissions to avoid throttling
 # https://docs.github.com/en/rest/using-the-rest-api/rate-limits-for-the-rest-api?apiVersion=2022-11-28#getting-a-higher-rate-limit
-PAT_NO_ACCESS = (
-    "github_pat"
-    + "_11AAHPVFQ0qAkDnSUaMKSp"
-    + "_ZkDl5NRRwBsUN6EYg9ahp1Dvj4FDDONnXVgimxC2EtpY7Q7BUKBoQ0Jq72X"
-)
+PAT_NO_ACCESS = "github_pat_"+"11AAHPVFQ0G4NTaQ73Bw5J"+"_fAp7K9sZ1qL8VFnI9g78eUlCdmOXHB3WzSdj2jtEYb4XF3N7PDJBl32qIxq"
+
 PAT = os.environ.get("GITHUB_TOKEN") or PAT_NO_ACCESS
 GH_CLIENT = Github(auth=Auth.Token(PAT))
 

{micropython_stubber-1.23.2 → micropython_stubber-1.23.3}/src/mpflash/mpflash/mpboard_id/store.py

@@ -1,18 +1,18 @@
 import functools
 import zipfile
 from pathlib import Path
-from typing import List, Optional
+from typing import Final, List, Optional
 
 import jsons
 
 from mpflash.mpboard_id.board import Board
 
 ###############################################################################################
-HERE = Path(__file__).parent
+HERE: Final = Path(__file__).parent
 ###############################################################################################
 
 
-def write_boardinfo_json(board_list: List[Board], *, folder: Path):
+def write_boardinfo_json(board_list: List[Board], *, folder: Optional[Path] = None):
     """Writes the board information to a JSON file.
 
     Args:
@@ -21,6 +21,8 @@ def write_boardinfo_json(board_list: List[Board], *, folder: Path):
     """
     import zipfile
 
+    if not folder:
+        folder = HERE
     # create a zip file with the json file
     with zipfile.ZipFile(folder / "board_info.zip", "w", compression=zipfile.ZIP_DEFLATED) as zipf:
         # write the list to json file inside the zip
@@ -30,6 +32,9 @@ def write_boardinfo_json(board_list: List[Board], *, folder: Path):
 
 @functools.lru_cache(maxsize=20)
 def read_known_boardinfo(board_info: Optional[Path] = None) -> List[Board]:
+    """Reads the board information from a JSON file in a zip file."""
+
+    import zipfile
 
     if not board_info:
         board_info = HERE / "board_info.zip"

{micropython_stubber-1.23.2 → micropython_stubber-1.23.3}/src/mpflash/mpflash/mpremoteboard/mpy_fw_info.py

@@ -36,7 +36,9 @@ 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": (
+                "stm32" if sys.platform.startswith("pyb") else sys.platform
+            ),  # port: esp32 / win32 / linux / stm32
             "board": "GENERIC",
             "cpu": "",
             "mpy": "",
@@ -48,7 +50,11 @@ def _info():  # type:() -> dict[str, str]
     except AttributeError:
         pass
     try:
-        machine = sys.implementation._machine if "_machine" in dir(sys.implementation) else os.uname().machine
+        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() if "with" in machine else ""
         info["mpy"] = (
@@ -100,7 +106,8 @@ def _info():  # type:() -> dict[str, str]
         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.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
@@ -110,19 +117,23 @@ def _info():  # type:() -> dict[str, str]
     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]
+        try:
+            arch = [
+                None,
+                "x86",
+                "x64",
+                "armv6",
+                "armv6m",
+                "armv7m",
+                "armv7em",
+                "armv7emsp",
+                "armv7emdp",
+                "xtensa",
+                "xtensawin",
+                "hazard3riscv",  # assumed
+            ][sys_mpy >> 10]
+        except IndexError:
+            arch = "unknown"
         if arch:
             info["arch"] = arch
         # .mpy version.minor