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

stubber/commands/clone_cmd.py

@@ -1,78 +1,78 @@
-"""Clone/fetch the micropython repos locally."""
-
-##########################################################################################
-# clone
-##########################################################################################
-import os
-from pathlib import Path
-from typing import List, Tuple, Union
-
-import rich_click as click
-import mpflash.basicgit as git
-from loguru import logger as log
-from stubber.utils.config import CONFIG
-
-from .cli import stubber_cli
-
-##########################################################################################
-# log = logging.getLogger("stubber")
-#########################################################################################
-
-
-@stubber_cli.command(name="clone")
-@click.option(
-    "--path",
-    "-p",
-    default=CONFIG.repo_path.as_posix(),
-    type=click.Path(file_okay=False, dir_okay=True),
-)
-@click.option(
-    "--stubs/--no-stubs",
-    "--add-stubs/--no-stubs",
-    "stubs",
-    default=False,
-    is_flag=True,
-    help="Also clone the micropython-stubs repo",
-)
-def cli_clone(path: Union[str, Path], stubs: bool = False):
-    """
-    Clone/fetch the micropython repos locally.
-
-    The local repos are used to generate frozen-stubs and doc-stubs.
-    """
-    dest_path = Path(path)
-    if not dest_path.exists():
-        os.mkdir(dest_path)
-    if dest_path == CONFIG.repo_path:
-        # same as default
-        mpy_path = CONFIG.mpy_path
-        mpy_lib_path = CONFIG.mpy_lib_path
-        mpy_stubs_path = CONFIG.mpy_stubs_path
-    else:
-        # repos are relative to provided path
-        mpy_path = dest_path / "micropython"
-        mpy_lib_path = dest_path / "micropython-lib"
-        mpy_stubs_path = dest_path / "micropython-stubs"
-
-    repos: List[Tuple[Path, str, str]] = [
-        (mpy_path, "https://github.com/micropython/micropython.git", "master"),
-        (mpy_lib_path, "https://github.com/micropython/micropython-lib.git", "master"),
-    ]
-    if stubs:
-        repos.append((mpy_stubs_path, "https://github.com/josverl/micropython-stubs.git", "main"))
-
-    for _path, remote, branch in repos:
-        log.info(f"Cloning {remote} branch {branch} to {_path}")
-        if not (_path / ".git").exists():
-            log.debug(f"Cloning {_path.name}...")
-            git.clone(remote_repo=remote, path=_path)
-        else:
-            log.debug(f"{_path.name} already exists, fetching...")
-            git.fetch(
-                _path,
-            )
-            git.pull(_path, branch=branch)  # DEFAULT
-
-    log.info(f"{mpy_path} {git.get_local_tag(mpy_path)}")
-    log.info(f"{mpy_lib_path} {git.get_local_tag(mpy_lib_path)}")
-    # click.echo(f"{mpy_stubs_path} {git.get_tag(mpy_stubs_path)}")
+"""Clone/fetch the micropython repos locally."""
+
+##########################################################################################
+# clone
+##########################################################################################
+import os
+from pathlib import Path
+from typing import List, Tuple, Union
+
+import rich_click as click
+import mpflash.basicgit as git
+from mpflash.logger import log
+from stubber.utils.config import CONFIG
+
+from .cli import stubber_cli
+
+##########################################################################################
+# log = logging.getLogger("stubber")
+#########################################################################################
+
+
+@stubber_cli.command(name="clone")
+@click.option(
+    "--path",
+    "-p",
+    default=CONFIG.repo_path.as_posix(),
+    type=click.Path(file_okay=False, dir_okay=True),
+)
+@click.option(
+    "--stubs/--no-stubs",
+    "--add-stubs/--no-stubs",
+    "stubs",
+    default=False,
+    is_flag=True,
+    help="Also clone the micropython-stubs repo",
+)
+def cli_clone(path: Union[str, Path], stubs: bool = False):
+    """
+    Clone/fetch the micropython repos locally.
+
+    The local repos are used to generate frozen-stubs and doc-stubs.
+    """
+    dest_path = Path(path)
+    if not dest_path.exists():
+        os.mkdir(dest_path)
+    if dest_path == CONFIG.repo_path:
+        # same as default
+        mpy_path = CONFIG.mpy_path
+        mpy_lib_path = CONFIG.mpy_lib_path
+        mpy_stubs_path = CONFIG.mpy_stubs_path
+    else:
+        # repos are relative to provided path
+        mpy_path = dest_path / "micropython"
+        mpy_lib_path = dest_path / "micropython-lib"
+        mpy_stubs_path = dest_path / "micropython-stubs"
+
+    repos: List[Tuple[Path, str, str]] = [
+        (mpy_path, "https://github.com/micropython/micropython.git", "master"),
+        (mpy_lib_path, "https://github.com/micropython/micropython-lib.git", "master"),
+    ]
+    if stubs:
+        repos.append((mpy_stubs_path, "https://github.com/josverl/micropython-stubs.git", "main"))
+
+    for _path, remote, branch in repos:
+        log.info(f"Cloning {remote} branch {branch} to {_path}")
+        if not (_path / ".git").exists():
+            log.debug(f"Cloning {_path.name}...")
+            git.clone(remote_repo=remote, path=_path)
+        else:
+            log.debug(f"{_path.name} already exists, fetching...")
+            git.fetch(
+                _path,
+            )
+            git.pull(_path, branch=branch)  # DEFAULT
+
+    log.info(f"{mpy_path} {git.get_local_tag(mpy_path)}")
+    log.info(f"{mpy_lib_path} {git.get_local_tag(mpy_lib_path)}")
+    # click.echo(f"{mpy_stubs_path} {git.get_tag(mpy_stubs_path)}")

stubber/commands/config_cmd.py

@@ -1,29 +1,29 @@
-"""Show the current configuration"""
-
-# pragma: no cover
-
-from loguru import logger as log
-
-from stubber.utils.config import CONFIG
-
-from .cli import stubber_cli
-
-
-@stubber_cli.command(name="show-config")
-def cli_config():
-    """
-    Show the current configuration
-    """
-    try:
-        # todo: sources[1] is depedent on the order the providers are added in
-        log.info(f"config file                {CONFIG._provider._config_sources[1].filename}")  # type: ignore
-    except Exception:
-        pass
-    log.info(f"CONFIG.repo_path           {CONFIG.repo_path}")
-    log.info(f"CONFIG.mpy_path            {CONFIG.mpy_path}")
-    log.info(f"CONFIG.mpy_lib_path        {CONFIG.mpy_lib_path}")
-    log.info(f"CONFIG.mpy_stubs_path      {CONFIG.mpy_stubs_path}")
-
-    log.info(f"CONFIG.stub_path           {CONFIG.stub_path}")
-    log.info(f"CONFIG.publish_path        {CONFIG.publish_path}")
-    log.info(f"CONFIG.template_path       {CONFIG.template_path}")
+"""Show the current configuration"""
+
+# pragma: no cover
+
+from mpflash.logger import log
+
+from stubber.utils.config import CONFIG
+
+from .cli import stubber_cli
+
+
+@stubber_cli.command(name="show-config")
+def cli_config():
+    """
+    Show the current configuration
+    """
+    try:
+        # todo: sources[1] is depedent on the order the providers are added in
+        log.info(f"config file                {CONFIG._provider._config_sources[1].filename}")  # type: ignore
+    except Exception:
+        pass
+    log.info(f"CONFIG.repo_path           {CONFIG.repo_path}")
+    log.info(f"CONFIG.mpy_path            {CONFIG.mpy_path}")
+    log.info(f"CONFIG.mpy_lib_path        {CONFIG.mpy_lib_path}")
+    log.info(f"CONFIG.mpy_stubs_path      {CONFIG.mpy_stubs_path}")
+
+    log.info(f"CONFIG.stub_path           {CONFIG.stub_path}")
+    log.info(f"CONFIG.publish_path        {CONFIG.publish_path}")
+    log.info(f"CONFIG.template_path       {CONFIG.template_path}")

stubber/commands/enrich_folder_cmd.py

@@ -1,71 +1,71 @@
-"""
-enrich machinestubs with docstubs
-"""
-
-from pathlib import Path
-from typing import Union
-
-import rich_click as click
-from loguru import logger as log
-
-from stubber.codemod.enrich import enrich_folder
-from stubber.utils.config import CONFIG
-
-from .cli import stubber_cli
-
-
-@stubber_cli.command(name="enrich")
-@click.option(
-    "--stubs",
-    "-s",
-    "stubs_folder",
-    default=CONFIG.stub_path.as_posix(),
-    type=click.Path(exists=True, file_okay=True, dir_okay=True),
-    help="File or folder containing the MCU stubs to be updated",
-    show_default=True,
-)
-@click.option(
-    "--docstubs",
-    "-ds",
-    "docstubs_folder",
-    default=CONFIG.stub_path.as_posix(),
-    type=click.Path(exists=True, file_okay=True, dir_okay=True),
-    help="File or folder containing the docstubs to be applied",
-    show_default=True,
-)
-@click.option("--diff", default=False, help="Show diff", show_default=True, is_flag=True)
-@click.option(
-    "--dry-run",
-    default=False,
-    help="Dry run does not write the files back",
-    show_default=True,
-    is_flag=True,
-)
-@click.option(
-    "--package-name",
-    "-p",
-    "package_name",
-    default="",
-    help="Package name to be enriched (Optional)",
-    show_default=True,
-)
-def cli_enrich_folder(
-    stubs_folder: Union[str, Path],
-    docstubs_folder: Union[str, Path],
-    diff: bool = False,
-    dry_run: bool = False,
-    package_name: str = "",
-):
-    """
-    Enrich the stubs in stub_folder with the docstubs in docstubs_folder.
-    """
-    write_back = not dry_run
-    log.info(f"Enriching {stubs_folder} with {docstubs_folder}")
-    _ = enrich_folder(
-        Path(stubs_folder),
-        Path(docstubs_folder),
-        show_diff=diff,
-        write_back=write_back,
-        require_docstub=False,
-        package_name=package_name,
-    )
+"""
+enrich machinestubs with docstubs
+"""
+
+from pathlib import Path
+from typing import Union
+
+import rich_click as click
+from mpflash.logger import log
+
+from stubber.codemod.enrich import enrich_folder
+from stubber.utils.config import CONFIG
+
+from .cli import stubber_cli
+
+
+@stubber_cli.command(name="enrich")
+@click.option(
+    "--stubs",
+    "-s",
+    "stubs_folder",
+    default=CONFIG.stub_path.as_posix(),
+    type=click.Path(exists=True, file_okay=True, dir_okay=True),
+    help="File or folder containing the MCU stubs to be updated",
+    show_default=True,
+)
+@click.option(
+    "--docstubs",
+    "-ds",
+    "docstubs_folder",
+    default=CONFIG.stub_path.as_posix(),
+    type=click.Path(exists=True, file_okay=True, dir_okay=True),
+    help="File or folder containing the docstubs to be applied",
+    show_default=True,
+)
+@click.option("--diff", default=False, help="Show diff", show_default=True, is_flag=True)
+@click.option(
+    "--dry-run",
+    default=False,
+    help="Dry run does not write the files back",
+    show_default=True,
+    is_flag=True,
+)
+@click.option(
+    "--package-name",
+    "-p",
+    "package_name",
+    default="",
+    help="Package name to be enriched (Optional)",
+    show_default=True,
+)
+def cli_enrich_folder(
+    stubs_folder: Union[str, Path],
+    docstubs_folder: Union[str, Path],
+    diff: bool = False,
+    dry_run: bool = False,
+    package_name: str = "",
+):
+    """
+    Enrich the stubs in stub_folder with the docstubs in docstubs_folder.
+    """
+    write_back = not dry_run
+    log.info(f"Enriching {stubs_folder} with {docstubs_folder}")
+    _ = enrich_folder(
+        Path(stubs_folder),
+        Path(docstubs_folder),
+        show_diff=diff,
+        write_back=write_back,
+        require_docstub=False,
+        package_name=package_name,
+    )

stubber/commands/get_core_cmd.py

@@ -1,71 +1,71 @@
-"""Get core CPython stubs from PyPi."""
-
-##########################################################################################
-# core
-##########################################################################################
-
-from pathlib import Path
-from typing import List
-
-import rich_click as click
-from loguru import logger as log
-
-import stubber.get_cpython as get_cpython
-import stubber.utils as utils
-from stubber.utils.config import CONFIG
-
-from .cli import stubber_cli
-
-##########################################################################################
-# log = logging.getLogger("stubber")
-#########################################################################################
-
-
-@stubber_cli.command(name="get-core")
-@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(
-    "--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_core(
-    stub_folder: str = "",
-    # core_type: str = "pycopy",  # pycopy or Micropython CPython stubs
-    stubgen: bool = True,
-    black: bool = True,
-):
-    """
-    Download core CPython stubs from PyPi.
-
-    Get the core (CPython compat) modules for both MicroPython and Pycopy.
-    """
-    # default parameter values
-    stub_folder = stub_folder or CONFIG.stub_path.as_posix()
-
-    stub_paths: List[Path] = []
-    for core_type in ["pycopy", "micropython"]:
-        log.info(f"::group:: Get Cpython core :{core_type}")
-        req_filename = f"requirements-core-{core_type}.txt"
-        stub_path = Path(stub_folder) / f"cpython_core-{core_type}"
-
-        get_cpython.get_core(
-            stub_path=stub_path.as_posix(), requirements=req_filename, family=core_type
-        )
-        stub_paths.append(stub_path)
-
-    log.info("::group:: start post processing of retrieved stubs")
-    utils.do_post_processing(stub_paths, stubgen=stubgen, black=black, autoflake=True)
-    log.info("::group:: Done")
+"""Get core CPython stubs from PyPi."""
+
+##########################################################################################
+# core
+##########################################################################################
+
+from pathlib import Path
+from typing import List
+
+import rich_click as click
+from mpflash.logger import log
+
+import stubber.get_cpython as get_cpython
+import stubber.utils as utils
+from stubber.utils.config import CONFIG
+
+from .cli import stubber_cli
+
+##########################################################################################
+# log = logging.getLogger("stubber")
+#########################################################################################
+
+
+@stubber_cli.command(name="get-core")
+@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(
+    "--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_core(
+    stub_folder: str = "",
+    # core_type: str = "pycopy",  # pycopy or Micropython CPython stubs
+    stubgen: bool = True,
+    black: bool = True,
+):
+    """
+    Download core CPython stubs from PyPi.
+
+    Get the core (CPython compat) modules for both MicroPython and Pycopy.
+    """
+    # default parameter values
+    stub_folder = stub_folder or CONFIG.stub_path.as_posix()
+
+    stub_paths: List[Path] = []
+    for core_type in ["pycopy", "micropython"]:
+        log.info(f"::group:: Get Cpython core :{core_type}")
+        req_filename = f"requirements-core-{core_type}.txt"
+        stub_path = Path(stub_folder) / f"cpython_core-{core_type}"
+
+        get_cpython.get_core(
+            stub_path=stub_path.as_posix(), requirements=req_filename, family=core_type
+        )
+        stub_paths.append(stub_path)
+
+    log.info("::group:: start post processing of retrieved stubs")
+    utils.do_post_processing(stub_paths, stubgen=stubgen, black=black, autoflake=True)
+    log.info("::group:: Done")