micropython-stubber 1.23.0__py3-none-any.whl → 1.23.1__py3-none-any.whl

stubber/publish/missing_class_methods.py

@@ -8,10 +8,10 @@ from pathlib import Path
 import libcst as cst
 from loguru import logger as log
 
+from mpflash.versions import clean_version
 from stubber.codemod.add_method import CallAdder, CallFinder
 from stubber.utils.config import CONFIG
 from stubber.utils.post import run_black
-from stubber.utils.versions import clean_version
 
 
 def add_machine_pin_call(merged_path: Path, version: str):

stubber/publish/package.py

@@ -11,11 +11,11 @@ from loguru import logger as log
 from packaging.version import parse
 from pysondb import PysonDB
 
+from mpflash.versions import clean_version
 from stubber.publish.defaults import GENERIC, GENERIC_L, default_board
 from stubber.publish.enums import StubSource
 from stubber.publish.stubpackage import StubPackage, StubSources
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import clean_version
 
 # replace std log handler with a custom one capped on INFO level
 log.remove()

stubber/publish/pathnames.py

@@ -8,10 +8,10 @@ from typing import Dict, Optional
 
 from loguru import logger as log
 
+from mpflash.versions import V_PREVIEW, clean_version
 from stubber.publish.defaults import default_board
 from stubber.publish.package import GENERIC
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import V_PREVIEW, clean_version
 
 
 ## Helper functions

stubber/publish/publish.py

@@ -8,12 +8,12 @@ from typing import Any, Dict, List, Optional, Union
 
 from loguru import logger as log
 
+from mpflash.versions import V_PREVIEW
 from stubber.publish.candidates import board_candidates, filter_list
 from stubber.publish.database import get_database
 from stubber.publish.defaults import GENERIC_U
 from stubber.publish.package import get_package
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import V_PREVIEW
 
 
 def build_multiple(

stubber/publish/stubpackage.py

@@ -9,7 +9,7 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 
 import tenacity
 
-from stubber.basicgit import get_git_describe
+from mpflash.basicgit import get_git_describe
 from stubber.publish.helpers import get_module_docstring
 
 try:
@@ -24,12 +24,12 @@ from loguru import logger as log
 from packaging.version import Version, parse
 from pysondb import PysonDB
 
+from mpflash.versions import SET_PREVIEW, V_PREVIEW, clean_version
 from stubber.publish.bump import bump_version
 from stubber.publish.defaults import GENERIC_U, default_board
 from stubber.publish.enums import StubSource
 from stubber.publish.pypi import Version, get_pypi_versions
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import SET_PREVIEW, V_PREVIEW, clean_version
 
 Status = NewType("Status", Dict[str, Union[str, None]])
 StubSources = List[Tuple[StubSource, Path]]
@@ -906,9 +906,7 @@ class StubPackage(PoetryBuilder):
             self.pkg_version = self.next_package_version(production)
             self.status["version"] = self.pkg_version
             # to get the next version
-            log.debug(
-                f"{self.package_name}: bump version for {old_ver} to {self.pkg_version } {'production' if production else 'test'}"
-            )
+            log.debug(f"{self.package_name}: bump version for {old_ver} to {self.pkg_version } {'production' if production else 'test'}")
             self.write_package_json()
             log.trace(f"New hash: {self.package_name} {self.pkg_version} {self.hash}")
             if self.poetry_build():

stubber/rst/reader.py

@@ -69,6 +69,7 @@ from typing import List, Optional, Tuple
 
 from loguru import logger as log
 
+from mpflash.versions import V_PREVIEW
 from stubber.rst import (
     CHILD_PARENT_CLASS,
     MODULE_GLUE,
@@ -82,7 +83,6 @@ from stubber.rst import (
 )
 from stubber.rst.lookup import Fix
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import V_PREVIEW
 
 SEPERATOR = "::"
 
@@ -369,9 +369,7 @@ class RSTParser(RSTReader):
     PARAM_RE_FIXES = [
         Fix(r"\[angle, time=0\]", "[angle], time=0", is_re=True),  # fix: method:: Servo.angle([angle, time=0])
         Fix(r"\[speed, time=0\]", "[speed], time=0", is_re=True),  # fix: .. method:: Servo.speed([speed, time=0])
-        Fix(
-            r"\[service_id, key=None, \*, \.\.\.\]", "[service_id], [key], *, ...", is_re=True
-        ),  # fix: network - AbstractNIC.connect
+        Fix(r"\[service_id, key=None, \*, \.\.\.\]", "[service_id], [key], *, ...", is_re=True),  # fix: network - AbstractNIC.connect
     ]
 
     def __init__(self, v_tag: str) -> None:
@@ -497,9 +495,7 @@ class RSTParser(RSTReader):
                 version = V_PREVIEW
             else:
                 version = self.source_tag.replace("_", ".")  # TODO Use clean_version(self.source_tag)
-            docstr[0] = (
-                f"{docstr[0]}.\n\nMicroPython module: https://docs.micropython.org/en/{version}/library/{module_name}.html"
-            )
+            docstr[0] = f"{docstr[0]}.\n\nMicroPython module: https://docs.micropython.org/en/{version}/library/{module_name}.html"
 
         self.output_dict.name = module_name
         self.output_dict.add_comment(f"# source version: {self.source_tag}")
@@ -637,9 +633,7 @@ class RSTParser(RSTReader):
             params = self.fix_parameters(params, f"{class_name}.{name}")
 
             # parse return type from docstring
-            ret_type = return_type_from_context(
-                docstring=docstr, signature=f"{class_name}.{name}", module=self.current_module
-            )
+            ret_type = return_type_from_context(docstring=docstr, signature=f"{class_name}.{name}", module=self.current_module)
             # methods have 4 flavours
             #   - __init__              (self,  <params>) -> None:
             #   - classmethod           (cls,   <params>) -> <ret_type>:
@@ -759,9 +753,7 @@ class RSTParser(RSTReader):
 
         # deal with documentation wildcards
         for name in names:
-            r_type = return_type_from_context(
-                docstring=docstr, signature=name, module=self.current_module, literal=True
-            )
+            r_type = return_type_from_context(docstring=docstr, signature=name, module=self.current_module, literal=True)
             if r_type in ["None"]:  # None does not make sense
                 r_type = "Incomplete"  # Default to Incomplete/ Unknown / int
             name = self.strip_prefixes(name)

stubber/tools/manifestfile.py

@@ -29,7 +29,6 @@ from __future__ import print_function
 import contextlib
 import os
 import sys
-import glob
 import tempfile
 from collections import namedtuple
 

stubber/update_fallback.py

@@ -9,7 +9,7 @@
 
 # from loguru import logger as log
 
-# from stubber.utils.versions import V_PREVIEW
+# from mpflash.versions import V_PREVIEW
 
 # # log = logging.getLogger()
 

stubber/utils/__init__.py

@@ -1,5 +1,6 @@
 # type: ignore
+from mpflash.versions import checkedout_version, clean_version
+
 from .manifest import make_manifest, manifest
 from .post import do_post_processing
 from .stubmaker import generate_pyi_files, generate_pyi_from_file
-from .versions import checkedout_version, clean_version

stubber/utils/config.py

@@ -7,8 +7,8 @@ from loguru import logger as log
 from typedconfig.config import Config, key, section
 from typedconfig.source import EnvironmentConfigSource
 
-import stubber.basicgit as git
-from stubber.utils.versions import V_PREVIEW
+import mpflash.basicgit as git
+from mpflash.versions import V_PREVIEW
 
 from .typed_config_toml import TomlConfigSource
 
@@ -113,9 +113,7 @@ def readconfig(filename: str = "pyproject.toml", prefix: str = "tool.", must_exi
     # add provider sources to the config
     config.add_source(EnvironmentConfigSource())
     if use_toml:
-        config.add_source(
-            TomlConfigSource(filename, prefix=prefix, must_exist=must_exist)
-        )  # ,"tools.micropython-stubber"))
+        config.add_source(TomlConfigSource(filename, prefix=prefix, must_exist=must_exist))  # ,"tools.micropython-stubber"))
     config.read()
     return config
 

stubber/utils/manifest.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Optional
 
 from .. import __version__
-from .versions import clean_version
+from mpflash.versions import clean_version
 
 # # log = logging.getLogger(__name__)
 # # logging.basicConfig(level=logging.INFO)
@@ -65,9 +65,7 @@ def make_manifest(folder: Path, family: str, port: str, version: str, release: s
     mod_manifest = manifest(family=family, port=port, machine=board, sysname=family, version=version, release=release, stubtype=stubtype)
     try:
         # list all *.py files, not strictly modules but decent enough for documentation
-        files = list(folder.glob("**/*.py"))
-        if not files:
-            files = list(folder.glob("**/*.pyi"))
+        files = list(folder.glob("**/*.py")) or list(folder.glob("**/*.pyi"))
 
         # sort the list
         for file in sorted(files):

stubber/utils/repos.py

@@ -11,10 +11,9 @@ from typing import Tuple
 from loguru import logger as log
 from packaging.version import Version
 
-import stubber.basicgit as git
-from mpflash.vendor.versions import get_stable_mp_version
+import mpflash.basicgit as git
+from mpflash.versions import SET_PREVIEW, V_PREVIEW, get_stable_mp_version
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import SET_PREVIEW, V_PREVIEW
 
 # # log = logging.getLogger(__name__)
 
@@ -64,11 +63,7 @@ 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
@@ -96,9 +91,7 @@ def match_lib_with_mpy(version_tag: str, mpy_path: Path, lib_path: Path) -> bool
                 return False
         return git.sync_submodules(mpy_path)
     else:
-        log.info(
-            f"Matching repo's:  Micropython {version_tag} needs micropython-lib:{micropython_lib_commits[version_tag]}"
-        )
+        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)
 
 
@@ -120,7 +113,7 @@ def fetch_repos(tag: str, mpy_path: Path, mpy_lib_path: Path):
         git.switch_branch(repo=mpy_path, branch="master")
     else:
         if tag == "stable":
-            tag = get_stable_mp_version() 
+            tag = get_stable_mp_version()
         git.switch_tag(tag, repo=mpy_path)
     result = match_lib_with_mpy(version_tag=tag, mpy_path=mpy_path, lib_path=mpy_lib_path)
 

mpflash/mpflash/flash_stm32_cube.py

@@ -1,111 +0,0 @@
-# """
-# Flash STM32 using STM32CubeProgrammer
-# needs to be installed independenty from https://www.st.com/en/development-tools/stm32cubeprog.html
-
-# On Linux needs to be run with sudo - unless udev rules are set to allow access to the device as a regular user
-# """
-
-# import subprocess
-# import sys
-# import time
-# from pathlib import Path
-# from typing import Optional
-
-# import bincopy
-# from loguru import logger as log
-# from rich.progress import track
-# from strip_ansi import strip_ansi
-
-# from .mpremoteboard.mpremoteboard import MPRemoteBoard
-
-# STM32_CLI_WIN = "C:\\Program Files\\STMicroelectronics\\STM32Cube\\STM32CubeProgrammer\\bin\\STM32_Programmer_CLI.exe"
-# STM32_CLI_LINUX = "~/STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin/STM32_Programmer_CLI"
-
-
-# def get_stm32_start_address(fw_file: Path):
-#     """
-#     Get the start address of the firmware file, to allow automatic restart from that address after flashing
-#     """
-#     try:
-#         fw_hex = bincopy.BinFile(str(fw_file))
-#         return f"0x{fw_hex.execution_start_address:08X}"
-#     except Exception:
-
-#         return ""
-
-
-# def flash_stm32_cubecli(mcu: MPRemoteBoard, fw_file: Path, *, erase: bool = True) -> Optional[MPRemoteBoard]:
-#     """
-#     Flash STM32 devices using STM32CubeProgrammer CLI
-#     - Enter bootloader mode
-#     - wait 2s for the device to be detected
-#     - list the connected DFU devices
-
-#     On Linux: requires udev rules to allow access to the device as a regular user
-#     """
-#     if sys.platform == "linux":
-#         STM32_CLI = Path(STM32_CLI_LINUX).expanduser().as_posix()
-#     elif sys.platform == "win32":
-#         STM32_CLI = str(Path(STM32_CLI_WIN).expanduser())
-#     else:
-#         log.error(f"OS {sys.platform} not supported")
-#         return None
-
-#     if not Path(STM32_CLI).exists():
-#         log.error(
-#             f"STM32CubeProgrammer not found at {STM32_CLI}\nPlease install it from https://www.st.com/en/development-tools/stm32cubeprog.html"
-#         )
-#         return None
-
-#     # run STM32_Programmer_CLI.exe --list
-#     cmd = [
-#         STM32_CLI,
-#         "--list",
-#     ]
-#     results = subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
-#     results = [strip_ansi(line) for line in results]
-#     if not any(["Product ID             : STM32  BOOTLOADER" in l for l in results]):
-#         log.error("No STM32 BOOTLOADER detected")
-#         return None
-#     echo = False
-#     for line in results:
-#         if line.startswith("=====  DFU Interface"):
-#             echo = True
-#         if line.startswith("===== STLink"):
-#             echo = False
-#         if echo:
-#             print(line)
-#     # Try to connect - no action
-#     cmd = [
-#         STM32_CLI,
-#         "--connect",
-#         "port=USB1",
-#     ]
-#     results = subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
-#     if erase:
-#         log.info("Erasing flash")
-#         cmd = [
-#             STM32_CLI,
-#             "--connect",
-#             "port=USB1",
-#             "--erase",
-#             "all",
-#         ]
-#         results = subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
-#         results = [strip_ansi(line) for line in results]
-#     log.info(f"Flashing {fw_file.name} using STM32CubeProgrammer CLI")
-#     start_address = get_stm32_start_address(fw_file)
-
-#     log.trace(f"STM32_Programmer_CLI --connect port=USB1 --write {str(fw_file)} --go {start_address}")
-#     cmd = [
-#         STM32_CLI,
-#         "--connect",
-#         "port=USB1",
-#         "--write",
-#         str(fw_file),
-#         "--go",
-#         start_address,
-#     ]
-#     results = subprocess.run(cmd, capture_output=True, text=True).stdout.splitlines()
-#     log.success("Done flashing, resetting the board and wait for it to restart")
-#     return mcu

mpflash/mpflash/vendor/versions.py

@@ -1,119 +0,0 @@
-"""
-#############################################################
-# Version handling copied from stubber/utils/versions.py
-#############################################################
-"""
-
-from functools import lru_cache
-
-from loguru import logger as log
-from packaging.version import parse
-
-from mpflash.common import GH_CLIENT
-OLDEST_VERSION = "1.16"
-"This is the oldest MicroPython version to build the stubs on"
-
-V_PREVIEW = "preview"
-"Latest preview version"
-
-SET_PREVIEW = {"preview", "latest", "master"}
-
-
-def clean_version(
-    version: str,
-    *,
-    build: bool = False,
-    patch: bool = False,
-    commit: bool = False,
-    drop_v: bool = False,
-    flat: bool = False,
-):
-    "Clean up and transform the many flavours of versions"
-    # 'v1.13.0-103-gb137d064e' --> 'v1.13-103'
-    if version in {"", "-"}:
-        return version
-    if version.lower() == "stable":
-        _v = get_stable_mp_version()
-        if not _v:
-            log.warning("Could not determine the latest stable version")
-            return "stable"
-        version = _v
-        log.trace(f"Using latest stable version: {version}")
-    is_preview = "-preview" in version
-    nibbles = version.split("-")
-    ver_ = nibbles[0].lower().lstrip("v")
-    if not patch and ver_ >= "1.10.0" and ver_ < "1.20.0" and ver_.endswith(".0"):
-        # remove the last ".0" - but only for versions between 1.10 and 1.20 (because)
-        nibbles[0] = nibbles[0][:-2]
-    if len(nibbles) == 1:
-        version = nibbles[0]
-    elif build and not is_preview:
-        version = "-".join(nibbles) if commit else "-".join(nibbles[:-1])
-    else:
-        # version = "-".join((nibbles[0], LATEST))
-        # HACK: this is not always right, but good enough most of the time
-        if is_preview:
-            version = "-".join((nibbles[0], V_PREVIEW))
-        else:
-            version = V_PREVIEW
-    if flat:
-        version = version.strip().replace(".", "_").replace("-", "_")
-    else:
-        version = version.strip().replace("_preview", "-preview").replace("_", ".")
-
-    if drop_v:
-        version = version.lstrip("v")
-    elif not version.startswith("v") and version.lower() not in SET_PREVIEW:
-        version = "v" + version
-    if version in SET_PREVIEW:
-        version = V_PREVIEW
-    return version
-
-
-@lru_cache(maxsize=10)
-def micropython_versions(minver: str = "v1.20", reverse: bool = False):
-    """Get the list of micropython versions from github tags"""
-    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:
-        versions = [
-            "v9.99.9-preview",
-            "v1.22.2",
-            "v1.22.1",
-            "v1.22.0",
-            "v1.21.1",
-            "v1.21.0",
-            "v1.20.0",
-            "v1.19.1",
-            "v1.19",
-            "v1.18",
-            "v1.17",
-            "v1.16",
-            "v1.15",
-            "v1.14",
-            "v1.13",
-            "v1.12",
-            "v1.11",
-            "v1.10",
-        ]
-    versions = [v for v in versions if parse(v) >= parse(minver)]
-    # remove all but the most recent (preview) version
-    versions = versions[:1] + [v for v in versions if "preview" not in v]
-    return sorted(versions, reverse=reverse)
-
-
-def get_stable_mp_version() -> str:
-    # read the versions from the git tags
-    all_versions = micropython_versions(minver=OLDEST_VERSION)
-    return [v for v in all_versions if not v.endswith(V_PREVIEW)][-1]
-
-
-def get_preview_mp_version() -> str:
-    # read the versions from the git tags
-    all_versions = micropython_versions(minver=OLDEST_VERSION)
-    return [v for v in all_versions if v.endswith(V_PREVIEW)][-1]
-