mpflash 1.24.1__tar.gz → 1.24.2__tar.gz

{mpflash-1.24.1 → mpflash-1.24.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mpflash
-Version: 1.24.1
+Version: 1.24.2
 Summary: Flash and download tool for MicroPython firmwares
 Home-page: https://github.com/Josverl/micropython-stubber/blob/main/src/mpflash/README.md
 License: MIT

{mpflash-1.24.1 → mpflash-1.24.2}/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:

{mpflash-1.24.1 → mpflash-1.24.2}/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"
-    + "_11AAHPVFQ0K6OKbI9xPFWG"
-    + "_3KossOkuuxRJ6MZrP5o2vMsAW2i3QFZx2BECNjL4o30S2XQBWF77JgQbJda"
-)
+PAT_NO_ACCESS = "github_pat_"+"11AAHPVFQ0G4NTaQ73Bw5J"+"_fAp7K9sZ1qL8VFnI9g78eUlCdmOXHB3WzSdj2jtEYb4XF3N7PDJBl32qIxq"
+
 PAT = os.environ.get("GITHUB_TOKEN") or PAT_NO_ACCESS
 GH_CLIENT = Github(auth=Auth.Token(PAT))
 

{mpflash-1.24.1 → mpflash-1.24.2}/mpflash/mpboard_id/__init__.py

@@ -24,7 +24,9 @@ def get_known_ports() -> List[str]:
     return sorted(list(ports))
 
 
-def get_known_boards_for_port(port: Optional[str] = "", versions: Optional[List[str]] = None) -> List[Board]:
+def get_known_boards_for_port(
+    port: Optional[str] = "", versions: Optional[List[str]] = None
+) -> List[Board]:
     """
     Returns a list of boards for the given port and version(s)
 
@@ -77,13 +79,16 @@ def known_stored_boards(port: str, versions: Optional[List[str]] = None) -> List
 @lru_cache(maxsize=20)
 def find_known_board(board_id: str) -> Board:
     """Find the board for the given BOARD_ID or 'board description' and return the board info as a Board object"""
-    # FIXME : functional overlap with:
+    # Some functional overlap with:
     # mpboard_id\board_id.py _find_board_id_by_description
     info = read_known_boardinfo()
     for board_info in info:
-        if board_id in (board_info.board_id, board_info.description):
+        if board_id in (
+            board_info.board_id,
+            board_info.description,
+        ) or board_info.description.startswith(board_id):
             if not board_info.cpu:
-                # safeguard for older board_info.json files
+                # failsafe for older board_info.json files
                 print(f"Board {board_id} has no CPU info, using port as CPU")
                 if " with " in board_info.description:
                     board_info.cpu = board_info.description.split(" with ")[-1]

{mpflash-1.24.1 → mpflash-1.24.2}/mpflash/mpboard_id/board_id.py

@@ -56,14 +56,12 @@ def _find_board_id_by_description(
         Path to the board_info.json file (optional)
 
     """
-    # FIXME: functional overlap with
+    # Some functional overlap with
     # src\mpflash\mpflash\mpboard_id\__init__.py find_known_board
 
+    candidate_boards = read_known_boardinfo(board_info)
     if not short_descr and " with " in descr:
         short_descr = descr.split(" with ")[0]
-
-    candidate_boards = read_known_boardinfo(board_info)
-
     if version:
         # filter for matching version
         if version in ("preview", "stable"):
@@ -71,16 +69,22 @@ def _find_board_id_by_description(
             version = get_stable_mp_version()
         known_versions = sorted({b.version for b in candidate_boards})
         if version not in known_versions:
-            # FIXME if latest stable is newer than the last version in the boardlist this will fail
             log.trace(f"Version {version} not found in board info, using latest known version {known_versions[-1]}")
-            version = known_versions[-1]
+            version = '.'.join(known_versions[-1].split('.')[:2]) # take only major.minor
         if version_matches := [b for b in candidate_boards if b.version.startswith(version)]:
             candidate_boards = version_matches
         else:
             raise MPFlashError(f"No board info found for version {version}")
+    # First try full match on description, then partial match
     matches = [b for b in candidate_boards if b.description == descr]
     if not matches and short_descr:
         matches = [b for b in candidate_boards if b.description == short_descr]
+    if not matches:
+        # partial match (for added VARIANT)
+        matches = [b for b in candidate_boards if b.description.startswith(descr)]
+        if not matches and short_descr:
+            matches = [b for b in candidate_boards if b.description.startswith(short_descr)]
     if not matches:
         raise MPFlashError(f"No board info found for description '{descr}' or '{short_descr}'")
     return sorted(matches, key=lambda x: x.version)
+

{mpflash-1.24.1 → mpflash-1.24.2}/mpflash/versions.py

@@ -72,16 +72,16 @@ def clean_version(
 
 
 @cache_to_disk(n_days_to_cache=1)
-def micropython_versions(minver: str = "v1.20", reverse: bool = False, cache_it=True):
+def micropython_versions(minver: str = "v1.20", reverse: bool = False):
     """Get the list of micropython versions from github tags"""
-
+    cache_it = True
     try:
         gh_client = GH_CLIENT
         repo = gh_client.get_repo("micropython/micropython")
         versions = [tag.name for tag in repo.get_tags() if parse(tag.name) >= parse(minver)]
         # Only keep the last preview
         versions = [v for v in versions if not v.endswith(V_PREVIEW) or v == versions[-1]]
-    except Exception as e:
+    except Exception:
         versions = [
             "v9.99.9-preview",
             "v1.22.2",

{mpflash-1.24.1 → mpflash-1.24.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mpflash"
-version = "1.24.1"
+version = "1.24.2"
 description = "Flash and download tool for MicroPython firmwares"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"