micropython-stubber 1.23.1.post1__py3-none-any.whl → 1.23.2__py3-none-any.whl

stubber/commands/get_frozen_cmd.py

@@ -1,117 +1,117 @@
-"""Get the frozen stubs for MicroPython."""
-
-##########################################################################################
-# get-frozen
-##########################################################################################
-from pathlib import Path
-from typing import List, Optional
-
-import rich_click as click
-from mpflash.logger import log
-
-import stubber.utils as utils
-from stubber.codemod.enrich import enrich_folder
-from stubber.freeze.get_frozen import freeze_any
-from stubber.utils.config import CONFIG
-from stubber.utils.repos import fetch_repos
-
-from .cli import stubber_cli
-
-##########################################################################################
-
-
-@stubber_cli.command(
-    name="get-frozen",
-    aliases=["get-frozen-stubs", "frozen"],
-)
-@click.option(
-    "--stub-folder",
-    "-stubs",
-    default=CONFIG.stub_path.as_posix(),
-    type=click.Path(exists=True, file_okay=False, dir_okay=True),
-    show_default=True,
-)
-@click.option(
-    "--version",
-    "--Version",
-    "-v",
-    "version",
-    default="",
-    # default=[CONFIG.stable_version],
-    show_default=True,
-    help="The version of MicroPython to get the frozen modules for. Use 'preview' to get the latest version from the micropython repo",
-)
-@click.option(
-    "--stubgen/--no-stubgen",
-    default=True,
-    help="Run stubgen to create .pyi files for the (new) frozen modules",
-    show_default=True,
-)
-@click.option(
-    "--black/--no-black",
-    default=True,
-    help="Run black on the (new) frozen modules",
-    show_default=True,
-)
-def cli_get_frozen(
-    stub_folder: Optional[str] = None,
-    # path: str = config.repo_path.as_posix(),
-    version: str = "",
-    stubgen: bool = True,
-    black: bool = True,
-    autoflake: bool = True,
-):
-    """
-    Get the frozen stubs for MicroPython.
-
-    Get the frozen modules for the checked out version of MicroPython
-    """
-    # default parameter values
-    stub_folder = stub_folder or CONFIG.stub_path.as_posix()
-    # FIXME: Stub_folder is not used
-
-    stub_paths: List[Path] = []
-
-    if version:
-        version = utils.clean_version(version, drop_v=False)
-        result = fetch_repos(version, CONFIG.mpy_path, CONFIG.mpy_lib_path)
-        if not result:
-            log.error(
-                "Failed to fetch repos for version: {} for micropython folder: {} and micropython-lib folder: {}".format(
-                    version, CONFIG.mpy_path.as_posix(), CONFIG.mpy_lib_path.as_posix()
-                )
-            )
-            return -1
-    # folder/{family}-{version[_preview]}-frozen
-    family = "micropython"
-    # get the current checked out version
-    version = utils.checkedout_version(CONFIG.mpy_path)
-    log.info("MicroPython version : {}".format(version))
-
-    stub_path = freeze_any(
-        version=version, mpy_path=CONFIG.mpy_path, mpy_lib_path=CONFIG.mpy_lib_path
-    )
-    stub_paths.append(stub_path)
-    # Also enrich the frozen modules from the doc stubs if available
-
-    # first create .pyi files so they can be enriched
-    utils.do_post_processing(stub_paths, stubgen=stubgen, black=False, autoflake=False)
-    family = "micropython"
-    _version = utils.clean_version(version, drop_v=False, flat=True)
-    docstubs_path = Path(CONFIG.stub_path) / f"{family}-{_version}-docstubs"
-    if docstubs_path.exists():
-        log.info(f"Enriching {str(stub_path)} with {docstubs_path}")
-        if merged := enrich_folder(
-            stub_path,
-            docstubs_path,
-            show_diff=False,
-            write_back=True,
-            require_docstub=False,
-        ):
-            log.info(f"Enriched {merged} frozen modules from docstubs")
-    else:
-        log.info(f"No docstubs found at {docstubs_path}")
-
-    log.info("::group:: start post processing of retrieved stubs")
-    utils.do_post_processing(stub_paths, stubgen=False, black=black, autoflake=autoflake)
-    log.info("::group:: Done")
+"""Get the frozen stubs for MicroPython."""
+
+##########################################################################################
+# get-frozen
+##########################################################################################
+from pathlib import Path
+from typing import List, Optional
+
+import rich_click as click
+from mpflash.logger import log
+
+import stubber.utils as utils
+from stubber.codemod.enrich import enrich_folder
+from stubber.freeze.get_frozen import freeze_any
+from stubber.utils.config import CONFIG
+from stubber.utils.repos import fetch_repos
+
+from .cli import stubber_cli
+
+##########################################################################################
+
+
+@stubber_cli.command(
+    name="get-frozen",
+    aliases=["get-frozen-stubs", "frozen"],
+)
+@click.option(
+    "--stub-folder",
+    "-stubs",
+    default=CONFIG.stub_path.as_posix(),
+    type=click.Path(exists=True, file_okay=False, dir_okay=True),
+    show_default=True,
+)
+@click.option(
+    "--version",
+    "--Version",
+    "-v",
+    "version",
+    default="",
+    # default=[CONFIG.stable_version],
+    show_default=True,
+    help="The version of MicroPython to get the frozen modules for. Use 'preview' to get the latest version from the micropython repo",
+)
+@click.option(
+    "--stubgen/--no-stubgen",
+    default=True,
+    help="Run stubgen to create .pyi files for the (new) frozen modules",
+    show_default=True,
+)
+@click.option(
+    "--black/--no-black",
+    default=True,
+    help="Run black on the (new) frozen modules",
+    show_default=True,
+)
+def cli_get_frozen(
+    stub_folder: Optional[str] = None,
+    # path: str = config.repo_path.as_posix(),
+    version: str = "",
+    stubgen: bool = True,
+    black: bool = True,
+    autoflake: bool = True,
+):
+    """
+    Get the frozen stubs for MicroPython.
+
+    Get the frozen modules for the checked out version of MicroPython
+    """
+    # default parameter values
+    stub_folder = stub_folder or CONFIG.stub_path.as_posix()
+    # FIXME: Stub_folder is not used
+
+    stub_paths: List[Path] = []
+
+    if version:
+        version = utils.clean_version(version, drop_v=False)
+        result = fetch_repos(version, CONFIG.mpy_path, CONFIG.mpy_lib_path)
+        if not result:
+            log.error(
+                "Failed to fetch repos for version: {} for micropython folder: {} and micropython-lib folder: {}".format(
+                    version, CONFIG.mpy_path.as_posix(), CONFIG.mpy_lib_path.as_posix()
+                )
+            )
+            return -1
+    # folder/{family}-{version[_preview]}-frozen
+    family = "micropython"
+    # get the current checked out version
+    version = utils.checkedout_version(CONFIG.mpy_path)
+    log.info("MicroPython version : {}".format(version))
+
+    stub_path = freeze_any(
+        version=version, mpy_path=CONFIG.mpy_path, mpy_lib_path=CONFIG.mpy_lib_path
+    )
+    stub_paths.append(stub_path)
+    # Also enrich the frozen modules from the doc stubs if available
+
+    # first create .pyi files so they can be enriched
+    utils.do_post_processing(stub_paths, stubgen=stubgen, black=False, autoflake=False)
+    family = "micropython"
+    _version = utils.clean_version(version, drop_v=False, flat=True)
+    docstubs_path = Path(CONFIG.stub_path) / f"{family}-{_version}-docstubs"
+    if docstubs_path.exists():
+        log.info(f"Enriching {str(stub_path)} with {docstubs_path}")
+        if merged := enrich_folder(
+            stub_path,
+            docstubs_path,
+            show_diff=False,
+            write_back=True,
+            require_docstub=False,
+        ):
+            log.info(f"Enriched {merged} frozen modules from docstubs")
+    else:
+        log.info(f"No docstubs found at {docstubs_path}")
+
+    log.info("::group:: start post processing of retrieved stubs")
+    utils.do_post_processing(stub_paths, stubgen=False, black=black, autoflake=autoflake)
+    log.info("::group:: Done")

stubber/commands/get_mcu_cmd.py

@@ -1,102 +1,102 @@
-"""Deploy and run createstubs on one or more microcontrollers."""
-
-##########################################################################################
-# stub
-##########################################################################################
-
-
-from typing import List
-import rich_click as click
-from mpflash.logger import log
-
-from stubber.bulk.mcu_stubber import stub_connected_mcus
-from stubber.utils.config import CONFIG
-
-from .cli import stubber_cli
-
-##########################################################################################
-# log = logging.getLogger("stubber")
-#########################################################################################
-
-
-@stubber_cli.command(
-    name="get-mcu-stubs",
-    aliases=["get-mcu-stubs", "mcu-stubs", "mcu"],
-)
-@click.option(
-    "--variant",
-    # "-v",
-    type=click.Choice(["Full", "Mem", "DB"], case_sensitive=False),
-    default="DB",
-    show_default=True,
-    help="Variant of createstubs to run",
-)
-@click.option(
-    "--format",
-    "-f",
-    type=click.Choice(["py", "mpy"], case_sensitive=False),
-    default="mpy",
-    show_default=True,
-    help="Python source or pre-compiled.",
-)
-@click.option(
-    "--serial",
-    "--serial-port",
-    "-s",
-    "serial",
-    default=["*"],
-    multiple=True,
-    show_default=True,
-    help="Which serial port(s) (or globs) to list. ",
-    metavar="SERIALPORT",
-)
-@click.option(
-    "--ignore",
-    "-i",
-    is_eager=True,
-    help="Serial port(s) (or globs) to ignore. Defaults to MPFLASH_IGNORE.",
-    multiple=True,
-    default=[],
-    envvar="MPFLASH_IGNORE",
-    show_default=True,
-    metavar="SERIALPORT",
-)
-@click.option(
-    "--bluetooth/--no-bluetooth",
-    "-b/-nb",
-    is_flag=True,
-    default=False,
-    show_default=True,
-    help="""Include bluetooth ports in the list""",
-)
-@click.option("--debug/--no-debug", default=False, show_default=True, help="Debug mode.")
-def cli_create_mcu_stubs(
-    variant: str,
-    format: str,
-    debug: bool,
-    serial: List[str],
-    ignore: List[str],
-    bluetooth: bool,
-) -> int:
-    """Run createstubs on one or more MCUs, and add the stubs to the micropython-stub repo."""
-    # check if all repos have been cloned
-    serial = list(serial)
-    ignore = list(ignore)
-
-    for repo in CONFIG.repos:
-        if not repo.exists():
-            log.error(
-                f"Repo {repo} not found, use 'stubber clone --add-stubs' to clone the repos."
-            )
-            exit(1)
-
-    exit(
-        stub_connected_mcus(
-            variant=variant,
-            format=format,
-            debug=debug,
-            serial=serial,
-            ignore=ignore,
-            bluetooth=bluetooth,
-        )
-    )
+"""Deploy and run createstubs on one or more microcontrollers."""
+
+##########################################################################################
+# stub
+##########################################################################################
+
+
+from typing import List
+import rich_click as click
+from mpflash.logger import log
+
+from stubber.bulk.mcu_stubber import stub_connected_mcus
+from stubber.utils.config import CONFIG
+
+from .cli import stubber_cli
+
+##########################################################################################
+# log = logging.getLogger("stubber")
+#########################################################################################
+
+
+@stubber_cli.command(
+    name="get-mcu-stubs",
+    aliases=["get-mcu-stubs", "mcu-stubs", "mcu"],
+)
+@click.option(
+    "--variant",
+    # "-v",
+    type=click.Choice(["Full", "Mem", "DB"], case_sensitive=False),
+    default="DB",
+    show_default=True,
+    help="Variant of createstubs to run",
+)
+@click.option(
+    "--format",
+    "-f",
+    type=click.Choice(["py", "mpy"], case_sensitive=False),
+    default="mpy",
+    show_default=True,
+    help="Python source or pre-compiled.",
+)
+@click.option(
+    "--serial",
+    "--serial-port",
+    "-s",
+    "serial",
+    default=["*"],
+    multiple=True,
+    show_default=True,
+    help="Which serial port(s) (or globs) to list. ",
+    metavar="SERIALPORT",
+)
+@click.option(
+    "--ignore",
+    "-i",
+    is_eager=True,
+    help="Serial port(s) (or globs) to ignore. Defaults to MPFLASH_IGNORE.",
+    multiple=True,
+    default=[],
+    envvar="MPFLASH_IGNORE",
+    show_default=True,
+    metavar="SERIALPORT",
+)
+@click.option(
+    "--bluetooth/--no-bluetooth",
+    "-b/-nb",
+    is_flag=True,
+    default=False,
+    show_default=True,
+    help="""Include bluetooth ports in the list""",
+)
+@click.option("--debug/--no-debug", default=False, show_default=True, help="Debug mode.")
+def cli_create_mcu_stubs(
+    variant: str,
+    format: str,
+    debug: bool,
+    serial: List[str],
+    ignore: List[str],
+    bluetooth: bool,
+) -> int:
+    """Run createstubs on one or more MCUs, and add the stubs to the micropython-stub repo."""
+    # check if all repos have been cloned
+    serial = list(serial)
+    ignore = list(ignore)
+
+    for repo in CONFIG.repos:
+        if not repo.exists():
+            log.error(
+                f"Repo {repo} not found, use 'stubber clone --add-stubs' to clone the repos."
+            )
+            exit(1)
+
+    exit(
+        stub_connected_mcus(
+            variant=variant,
+            format=format,
+            debug=debug,
+            serial=serial,
+            ignore=ignore,
+            bluetooth=bluetooth,
+        )
+    )

stubber/commands/merge_cmd.py

@@ -1,66 +1,66 @@
-"""
-enrich machinestubs with docstubs
-"""
-
-from typing import List, Union
-
-import rich_click as click
-from mpflash.logger import log
-
-from stubber.publish.merge_docstubs import merge_all_docstubs
-from stubber.publish.package import GENERIC_L
-from stubber.utils.config import CONFIG
-
-from .cli import stubber_cli
-
-
-@stubber_cli.command(name="merge")
-@click.option("--family", default="micropython", type=str, show_default=True)
-@click.option(
-    "--version",
-    "-v",
-    "versions",
-    multiple=True,
-    default=["all"],
-    # type=click.Choice(ALL_VERSIONS),
-    show_default=True,
-    help="'latest', 'auto', or one or more versions",
-)
-@click.option(
-    "--port",
-    "-p",
-    "ports",
-    multiple=True,
-    default=["all"],
-    show_default=True,
-    help="multiple: ",
-)
-@click.option(
-    "--board",
-    "-b",
-    "boards",
-    multiple=True,
-    default=[GENERIC_L],  # or "all" ?
-    show_default=True,
-    help="multiple: ",
-)
-def cli_merge_docstubs(
-    versions: Union[str, List[str]],
-    boards: Union[str, List[str]],
-    ports: Union[str, List[str]],
-    family: str,
-):
-    """
-    Enrich the stubs in stub_folder with the docstubs in docstubs_folder.
-    """
-    if isinstance(ports, tuple):
-        ports = list(ports)
-    if isinstance(boards, tuple):
-        boards = list(boards)
-    if isinstance(versions, tuple):
-        versions = list(versions)
-    # single version should be a string
-    log.info(f"Merge docstubs for {family} {versions}")
-    _ = merge_all_docstubs(
-        versions=versions, family=family, boards=boards, ports=ports, mpy_path=CONFIG.mpy_path
-    )
+"""
+enrich machinestubs with docstubs
+"""
+
+from typing import List, Union
+
+import rich_click as click
+from mpflash.logger import log
+
+from stubber.publish.merge_docstubs import merge_all_docstubs
+from stubber.publish.package import GENERIC_L
+from stubber.utils.config import CONFIG
+
+from .cli import stubber_cli
+
+
+@stubber_cli.command(name="merge")
+@click.option("--family", default="micropython", type=str, show_default=True)
+@click.option(
+    "--version",
+    "-v",
+    "versions",
+    multiple=True,
+    default=["all"],
+    # type=click.Choice(ALL_VERSIONS),
+    show_default=True,
+    help="'latest', 'auto', or one or more versions",
+)
+@click.option(
+    "--port",
+    "-p",
+    "ports",
+    multiple=True,
+    default=["all"],
+    show_default=True,
+    help="multiple: ",
+)
+@click.option(
+    "--board",
+    "-b",
+    "boards",
+    multiple=True,
+    default=[GENERIC_L],  # or "all" ?
+    show_default=True,
+    help="multiple: ",
+)
+def cli_merge_docstubs(
+    versions: Union[str, List[str]],
+    boards: Union[str, List[str]],
+    ports: Union[str, List[str]],
+    family: str,
+):
+    """
+    Enrich the stubs in stub_folder with the docstubs in docstubs_folder.
+    """
+    if isinstance(ports, tuple):
+        ports = list(ports)
+    if isinstance(boards, tuple):
+        boards = list(boards)
+    if isinstance(versions, tuple):
+        versions = list(versions)
+    # single version should be a string
+    log.info(f"Merge docstubs for {family} {versions}")
+    _ = merge_all_docstubs(
+        versions=versions, family=family, boards=boards, ports=ports, mpy_path=CONFIG.mpy_path
+    )