micropython-stubber 1.17.6__py3-none-any.whl → 1.20.0__py3-none-any.whl

stubber/codemod/board.py

@@ -1,6 +1,7 @@
 """" 
 Codemods to create the different variants of createstubs.py
 """
+
 from __future__ import annotations
 
 from enum import Enum
@@ -129,7 +130,9 @@ class ReadModulesCodemod(codemod.Codemod):
 
     def __init__(self, context: codemod.CodemodContext, reader_node: Optional[cst.Module] = None):
         super().__init__(context)
-        self.modules_reader_node = reader_node or cst.parse_module(Partial.MODULES_READER.contents())
+        self.modules_reader_node = reader_node or cst.parse_module(
+            Partial.MODULES_READER.contents(),  # type: ignore
+        )
 
     def transform_module_impl(self, tree: cst.Module) -> cst.Module:
         """Replaces static modules list with file-load method."""
@@ -213,7 +216,9 @@ class LVGLCodemod(codemod.Codemod):
         # return self.modules_transform.transform_module_impl(tree)
 
         docstr_transformer = ModuleDocCodemod(self.context, _LVGL_MODULE_DOC)
-        def_main_tree = cst.parse_module(Partial.LVGL_MAIN.contents())
+        def_main_tree = cst.parse_module(
+            Partial.LVGL_MAIN.contents(),  # type: ignore
+        )
 
         work_tree = docstr_transformer.transform_module_impl(tree)
         matches = m.findall(work_tree, _DEF_MAIN_MATCHER, metadata_resolver=self)
@@ -253,7 +258,9 @@ class DBCodemod(codemod.Codemod):
     def transform_module_impl(self, tree: cst.Module) -> cst.Module:
         """Generates createstubs.py db variant."""
         docstr_transformer = ModuleDocCodemod(self.context, _DB_MODULE_DOC)
-        def_main_tree = cst.parse_module(Partial.DB_MAIN.contents())
+        def_main_tree = cst.parse_module(
+            Partial.DB_MAIN.contents(),  # type: ignore
+        )
 
         work_tree = docstr_transformer.transform_module_impl(tree)
         matches = m.findall(work_tree, _DEF_MAIN_MATCHER, metadata_resolver=self)

stubber/commands/clone_cmd.py

@@ -31,16 +31,16 @@ def cli_clone(path: Union[str, Path], stubs: bool = False):
     dest_path = Path(path)
     if not dest_path.exists():
         os.mkdir(dest_path)
-    # repos are relative to provided path
-    if dest_path != CONFIG.repo_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"
-    else:
-        mpy_path = CONFIG.mpy_path
-        mpy_lib_path = CONFIG.mpy_lib_path
-
-        mpy_stubs_path = CONFIG.stub_path.parent
 
     repos: List[Tuple[Path, str, str]] = [
         (mpy_path, "https://github.com/micropython/micropython.git", "master"),

stubber/commands/config_cmd.py

@@ -1,7 +1,9 @@
 """Show the current configuration"""
+
 # pragma: no cover
 
 from loguru import logger as log
+
 from stubber.utils.config import CONFIG
 
 from .cli import stubber_cli
@@ -20,6 +22,7 @@ def cli_config():
     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}")

stubber/commands/{mcu_cmd.py → get_mcu_cmd.py}

@@ -1,12 +1,16 @@
 """Deploy and run createstubs on one or more microcontrollers."""
+
 ##########################################################################################
 # stub
 ##########################################################################################
 
 
 import click
+from loguru import logger as log
 
 from stubber.bulk.mcu_stubber import stub_connected_mcus
+from stubber.utils.config import CONFIG
+
 from .cli import stubber_cli
 
 ##########################################################################################
@@ -32,8 +36,21 @@ from .cli import stubber_cli
     help="Python source or pre-compiled.",
 )
 @click.option("--debug/--no-debug", default=False, show_default=True, help="Debug mode.")
-@click.option("--reset/--no-reset", default=False, show_default=True, help="Reset the board before running createstubs.")
-@click.option("--github/--local", default=True, show_default=True, help="where to install the board files from. local is intended for development.")
-def cli_create_mcu_stubs(variant: str, format: str, debug: bool, reset:bool, github:bool) -> int:
+@click.option(
+    "--reset/--no-reset", default=False, show_default=True, help="Reset the board before running createstubs."
+)
+@click.option(
+    "--github/--local",
+    default=True,
+    show_default=True,
+    help="where to install the board files from. local is intended for development.",
+)
+def cli_create_mcu_stubs(variant: str, format: str, debug: bool, reset: bool, github: 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
+    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))

stubber/freeze/get_frozen.py

@@ -25,9 +25,7 @@ from typing import List, Optional
 from loguru import logger as log
 from packaging.version import Version
 
-import stubber.basicgit as git
 from stubber import utils
-from stubber.codemod.add_comment import AddComment
 from stubber.freeze.freeze_folder import freeze_folders  # Micropython < v1.12
 from stubber.freeze.freeze_manifest_2 import freeze_one_manifest_2
 from stubber.utils.config import CONFIG

stubber/publish/candidates.py

@@ -236,7 +236,7 @@ def board_candidates(
         else:
             r = git.checkout_tag(repo=mpy_path, tag=version)
         if not r:
-            log.warning(f"Incorrect version or did you run `stubber clone` to get the micropython repo?")
+            log.warning(f"Incorrect version: {version} or did you forget to run `stubber clone` to get the micropython repo?")
             return []
         ports = list_micropython_ports(family=family, mpy_path=mpy_path)
         for port in ports:

stubber/publish/package.py

@@ -4,7 +4,7 @@ prepare a set of stub files for publishing to PyPi
 """
 import sys
 from pathlib import Path
-from typing import Dict, List, Tuple, Union
+from typing import Dict, Union
 
 from loguru import logger as log
 from packaging.version import parse

stubber/publish/pathnames.py

@@ -4,7 +4,7 @@ Helper functions to deal with path names and filenames for the folders in the st
 """
 
 from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Dict, Optional
 
 from loguru import logger as log
 

stubber/publish/stubpackage.py

@@ -790,6 +790,7 @@ class StubPackage(PoetryBuilder):
                 "name": self.package_name,
                 "version": self.pkg_version,
                 "error": None,
+                "path": self.package_path.as_posix(),
             }
         )
         super().__init__(

stubber/rst/lookup.py

@@ -3,7 +3,7 @@ Lookup tables for the rst documentation stubber
 """
 
 from dataclasses import dataclass
-from typing import Dict, List, Optional, Tuple
+from typing import List, Optional, Tuple
 
 # These are shown to import
 __all__ = [

stubber/stubber.py

@@ -12,16 +12,12 @@ from stubber.commands.enrich_folder_cmd import cli_enrich_folder
 from stubber.commands.get_core_cmd import cli_get_core
 from stubber.commands.get_docstubs_cmd import cli_docstubs
 from stubber.commands.get_frozen_cmd import cli_get_frozen
-# from stubber.commands.get_lobo_cmd import cli_get_lobo
 from stubber.commands.merge_cmd import cli_merge_docstubs
-# from stubber.commands.minify_cmd import cli_minify
 from stubber.commands.publish_cmd import cli_publish
 from stubber.commands.stub_cmd import cli_stub
 from stubber.commands.switch_cmd import cli_switch
-# from stubber.commands.upd_fallback_cmd import cli_update_fallback
-# from stubber.commands.upd_module_list_cmd import cli_update_module_list
 from stubber.commands.variants_cmd import cli_variants
-from stubber.commands.mcu_cmd import cli_create_mcu_stubs
+from stubber.commands.get_mcu_cmd import cli_create_mcu_stubs
 
 ##########################################################################################
 if __name__ == "__main__":
@@ -33,14 +29,10 @@ if __name__ == "__main__":
     stubber_cli.add_command(cli_docstubs)
     stubber_cli.add_command(cli_get_core)
     stubber_cli.add_command(cli_get_frozen)
-    # stubber_cli.add_command(cli_get_lobo)
     stubber_cli.add_command(cli_stub)
     stubber_cli.add_command(cli_enrich_folder)
-    # stubber_cli.add_command(cli_minify)
     stubber_cli.add_command(cli_publish)
     stubber_cli.add_command(cli_merge_docstubs)
-    # stubber_cli.add_command(cli_update_module_list)
-    # stubber_cli.add_command(cli_update_fallback)
     stubber_cli.add_command(cli_variants)
     stubber_cli.add_command(cli_create_mcu_stubs)
     stubber_cli()

stubber/tools/manifestfile.py

@@ -26,10 +26,10 @@
 # THE SOFTWARE.
 
 from __future__ import print_function
+
 import contextlib
 import os
 import sys
-import glob
 import tempfile
 from collections import namedtuple
 
@@ -270,7 +270,9 @@ class ManifestFile:
                 raise ManifestFileError("Expected .py file")
             kind = KIND_COMPILE_AS_MPY
 
-        self._manifest_files.append(ManifestOutput(FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, self._metadata[-1], opt))
+        self._manifest_files.append(
+            ManifestOutput(FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, self._metadata[-1], opt)
+        )
 
     def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=False):
         base_path = self._resolve_path(base_path)
@@ -411,7 +413,7 @@ class ManifestFile:
 
             for lib_dir in lib_dirs:
                 # Search for {lib_dir}/**/{name}/manifest.py.
-                for root, dirnames, filenames in os.walk(os.path.join(self._path_vars["MPY_LIB_DIR"], lib_dir)):
+                for root, _, filenames in os.walk(os.path.join(self._path_vars["MPY_LIB_DIR"], lib_dir)):
                     if os.path.basename(root) == name and "manifest.py" in filenames:
                         self.include(root, is_require=True, **kwargs)
                         return

stubber/update_fallback.py

@@ -1,117 +1,117 @@
-"""build/update the fallback 'catch-all' stubfolder"""
+# """build/update the fallback 'catch-all' stubfolder"""
 
-import os
-import shutil
-from distutils.dir_util import copy_tree
-from distutils.errors import DistutilsFileError
-from pathlib import Path
-from typing import List, Optional, Tuple
+# import os
+# import shutil
+# from distutils.dir_util import copy_tree
+# from distutils.errors import DistutilsFileError
+# from pathlib import Path
+# from typing import List, Optional, Tuple
 
-from loguru import logger as log
+# from loguru import logger as log
 
-from stubber.utils.versions import V_PREVIEW
+# from stubber.utils.versions import V_PREVIEW
 
-# log = logging.getLogger()
+# # log = logging.getLogger()
 
-RELEASED = "v1_18"
+# RELEASED = "v1_18"
 
 
-def fallback_sources(version: str, fw_version: Optional[str] = None) -> List[Tuple[str, str]]:
-    # sourcery skip: inline-immediately-returned-variable
-    """
-    list of sources to build/update the fallback 'catch-all' stubfolder
-    version : the version to use
-    fw_version : version to source the MCU stubs from. Defaults to the version used , but can be lower
+# def fallback_sources(version: str, fw_version: Optional[str] = None) -> List[Tuple[str, str]]:
+#     # sourcery skip: inline-immediately-returned-variable
+#     """
+#     list of sources to build/update the fallback 'catch-all' stubfolder
+#     version : the version to use
+#     fw_version : version to source the MCU stubs from. Defaults to the version used , but can be lower
 
-    """
-    if not fw_version:
-        fw_version = version
-    if fw_version == V_PREVIEW:
-        fw_version = RELEASED
-    SOURCES = [
-        ("uasyncio", f"micropython-{fw_version}-esp32"),
-        ("umqtt", f"micropython-{fw_version}-esp32"),
-        ("_onewire.py*", f"micropython-{fw_version}-esp32"),
-        ("_uasyncio.py*", f"micropython-{fw_version}-esp32"),
-        ("array.py*", f"micropython-{fw_version}-esp32"),
-        ("binascii.py*", f"micropython-{fw_version}-esp32"),
-        ("hashlib.py*", f"micropython-{fw_version}-esp32"),
-        ("machine.py*", f"micropython-{fw_version}-esp32"),
-        ("micropython.py*", f"micropython-{version}-docstubs"),  # esp32"),
-        ("network.pyi", f"micropython-{version}-docstubs"),  # esp32"),
-        ("struct.py*", f"micropython-{fw_version}-esp32"),
-        ("uarray.py*", f"micropython-{fw_version}-esp32"),
-        ("ubinascii.py*", f"micropython-{fw_version}-esp32"),
-        ("uctypes.py*", f"micropython-{fw_version}-esp32"),
-        ("uerrno.py*", f"micropython-{fw_version}-esp32"),
-        ("uhashlib.py*", f"micropython-{fw_version}-esp32"),
-        ("uio.py*", f"micropython-{fw_version}-esp32"),
-        ("ujson.py*", f"micropython-{fw_version}-esp32"),
-        ("uselect.py*", f"micropython-{fw_version}-esp32"),
-        ("usocket.py*", f"micropython-{fw_version}-esp32"),
-        ("ussl.py*", f"micropython-{fw_version}-esp32"),
-        ("ustruct.py*", f"micropython-{fw_version}-esp32"),
-        ("sys.py*", f"micropython-{fw_version}-esp32"),
-        ("usys.py*", f"micropython-{fw_version}-esp32"),
-        ("uzlib.py*", f"micropython-{fw_version}-esp32"),
-        ("bluetooth.py*", f"micropython-{version}-docstubs"),
-        # esp
-        ("esp.py*", f"micropython-{version}-docstubs"),  # 8266 fw stub has most functions
-        ("esp32.py*", f"micropython-{version}-docstubs"),  # esp32"),
-        # pyboard == stm32
-        ("pyb.py*", f"micropython-{fw_version}-stm32"),
-        ("framebuf.py*", f"micropython-{fw_version}-stm32"),
-        # rp2
-        ("_rp2.py*", f"micropython-{fw_version}-rp2"),
-        # stdlib
-        ("os.py*", f"micropython-{fw_version}-esp32"),  # -> stdlib
-        ("uos.py*", f"micropython-{fw_version}-esp32"),
-        ("time.py*", f"micropython-{fw_version}-esp32"),  # -> stdlib
-        ("utime.py*", f"micropython-{fw_version}-esp32"),
-    ]
-    return SOURCES
+#     """
+#     if not fw_version:
+#         fw_version = version
+#     if fw_version == V_PREVIEW:
+#         fw_version = RELEASED
+#     SOURCES = [
+#         ("uasyncio", f"micropython-{fw_version}-esp32"),
+#         ("umqtt", f"micropython-{fw_version}-esp32"),
+#         ("_onewire.py*", f"micropython-{fw_version}-esp32"),
+#         ("_uasyncio.py*", f"micropython-{fw_version}-esp32"),
+#         ("array.py*", f"micropython-{fw_version}-esp32"),
+#         ("binascii.py*", f"micropython-{fw_version}-esp32"),
+#         ("hashlib.py*", f"micropython-{fw_version}-esp32"),
+#         ("machine.py*", f"micropython-{fw_version}-esp32"),
+#         ("micropython.py*", f"micropython-{version}-docstubs"),  # esp32"),
+#         ("network.pyi", f"micropython-{version}-docstubs"),  # esp32"),
+#         ("struct.py*", f"micropython-{fw_version}-esp32"),
+#         ("uarray.py*", f"micropython-{fw_version}-esp32"),
+#         ("ubinascii.py*", f"micropython-{fw_version}-esp32"),
+#         ("uctypes.py*", f"micropython-{fw_version}-esp32"),
+#         ("uerrno.py*", f"micropython-{fw_version}-esp32"),
+#         ("uhashlib.py*", f"micropython-{fw_version}-esp32"),
+#         ("uio.py*", f"micropython-{fw_version}-esp32"),
+#         ("ujson.py*", f"micropython-{fw_version}-esp32"),
+#         ("uselect.py*", f"micropython-{fw_version}-esp32"),
+#         ("usocket.py*", f"micropython-{fw_version}-esp32"),
+#         ("ussl.py*", f"micropython-{fw_version}-esp32"),
+#         ("ustruct.py*", f"micropython-{fw_version}-esp32"),
+#         ("sys.py*", f"micropython-{fw_version}-esp32"),
+#         ("usys.py*", f"micropython-{fw_version}-esp32"),
+#         ("uzlib.py*", f"micropython-{fw_version}-esp32"),
+#         ("bluetooth.py*", f"micropython-{version}-docstubs"),
+#         # esp
+#         ("esp.py*", f"micropython-{version}-docstubs"),  # 8266 fw stub has most functions
+#         ("esp32.py*", f"micropython-{version}-docstubs"),  # esp32"),
+#         # pyboard == stm32
+#         ("pyb.py*", f"micropython-{fw_version}-stm32"),
+#         ("framebuf.py*", f"micropython-{fw_version}-stm32"),
+#         # rp2
+#         ("_rp2.py*", f"micropython-{fw_version}-rp2"),
+#         # stdlib
+#         ("os.py*", f"micropython-{fw_version}-esp32"),  # -> stdlib
+#         ("uos.py*", f"micropython-{fw_version}-esp32"),
+#         ("time.py*", f"micropython-{fw_version}-esp32"),  # -> stdlib
+#         ("utime.py*", f"micropython-{fw_version}-esp32"),
+#     ]
+#     return SOURCES
 
 
-def update_fallback(stubpath: Path, fallback_path: Path, version: str = RELEASED):
-    "update the fallback stubs from the defined sources"
-    # remove all *.py/.pyi files
-    if not fallback_path.exists():
-        os.makedirs(fallback_path)
-    else:
-        oldstubs = list(fallback_path.rglob("*.py")) + list(fallback_path.rglob("*.pyi"))
-        log.debug(f"deleting {len(oldstubs)} stubs from {fallback_path.as_posix()}")
-        for f in oldstubs:
-            try:
-                os.remove(f)
-            except OSError as e:
-                log.warning(e)
-    added = 0
-    for name, source in fallback_sources(version):
-        if "." not in name:
-            # copy folder
-            log.debug(f"add {source} folder")
-            try:
-                copy_tree(
-                    (stubpath / source / name).as_posix(),
-                    (fallback_path / name).as_posix(),
-                )
-                added += 1
-            except DistutilsFileError:
-                log.warning(f"{(stubpath / source / name).as_posix()} not found")
-        else:
-            # copy file(s)
-            log.debug(f"add {source}")
-            for f in (stubpath / source).glob(name):
-                shutil.copyfile(f, fallback_path / f.name)
-                added += 1
-    return added
+# def update_fallback(stubpath: Path, fallback_path: Path, version: str = RELEASED):
+#     "update the fallback stubs from the defined sources"
+#     # remove all *.py/.pyi files
+#     if not fallback_path.exists():
+#         os.makedirs(fallback_path)
+#     else:
+#         oldstubs = list(fallback_path.rglob("*.py")) + list(fallback_path.rglob("*.pyi"))
+#         log.debug(f"deleting {len(oldstubs)} stubs from {fallback_path.as_posix()}")
+#         for f in oldstubs:
+#             try:
+#                 os.remove(f)
+#             except OSError as e:
+#                 log.warning(e)
+#     added = 0
+#     for name, source in fallback_sources(version):
+#         if "." not in name:
+#             # copy folder
+#             log.debug(f"add {source} folder")
+#             try:
+#                 copy_tree(
+#                     (stubpath / source / name).as_posix(),
+#                     (fallback_path / name).as_posix(),
+#                 )
+#                 added += 1
+#             except DistutilsFileError:
+#                 log.warning(f"{(stubpath / source / name).as_posix()} not found")
+#         else:
+#             # copy file(s)
+#             log.debug(f"add {source}")
+#             for f in (stubpath / source).glob(name):
+#                 shutil.copyfile(f, fallback_path / f.name)
+#                 added += 1
+#     return added
 
 
-if __name__ == "__main__":
-    from stubber.utils.config import CONFIG
+# if __name__ == "__main__":
+#     from stubber.utils.config import CONFIG
 
-    update_fallback(
-        CONFIG.stub_path,
-        CONFIG.fallback_path,
-        version=RELEASED,
-    )
+#     update_fallback(
+#         CONFIG.stub_path,
+#         CONFIG.fallback_path,
+#         version=RELEASED,
+#     )

stubber/utils/config.py

@@ -1,6 +1,7 @@
 """stubber configuration"""
 
 from pathlib import Path
+from typing import List
 
 from loguru import logger as log
 from typedconfig.config import Config, key, section
@@ -15,43 +16,25 @@ from .typed_config_toml import TomlConfigSource
 @section("micropython-stubber")
 class StubberConfig(Config):
     "stubber configuration class"
-    stub_path = key(key_name="stub-path", cast=Path, required=False, default=Path("./stubs"))
-    "a Path to the stubs directory"
     # relative to stubs folder
-    fallback_path = key(key_name="fallback-path", cast=Path, required=False, default=Path("typings/fallback"))
+    fallback_path: Path = key(key_name="fallback-path", cast=Path, required=False, default=Path("typings/fallback"))
     "a Path to the fallback stubs directory"
 
     # ------------------------------------------------------------------------------------------
     # micropython and micropython-lib are relative to ./repo folder
-    repo_path = key(key_name="repo-path", cast=Path, required=False, default=Path("./repos"))
+    repo_path: Path = key(key_name="repo-path", cast=Path, required=False, default=Path("./repos"))
     "a Path to the repo directory"
 
-    mpy_path = key(key_name="mpy-path", cast=Path, required=False, default=Path("micropython"))
+    mpy_path: Path = key(key_name="mpy-path", cast=Path, required=False, default=Path("micropython"))
     "a Path to the micropython folder in the repos directory"
 
-    mpy_lib_path = key(key_name="mpy-lib-path", cast=Path, required=False, default=Path("micropython-lib"))
+    mpy_lib_path: Path = key(key_name="mpy-lib-path", cast=Path, required=False, default=Path("micropython-lib"))
     "a Path to the micropython-lib folder in the repos directory"
 
-    # mpy_stubs_repo_path = key(key_name="mpy-stubs-repo-path", cast=Path, required=False, default=Path("./micropython-stubs"))
-    # "a Path to the micropython-stubs folder in the repos directory"
+    mpy_stubs_path: Path = key(key_name="mpy-stubs-path", cast=Path, required=False, default=Path("micropython-stubs"))
+    "a Path to the micropython-stubs folder in the repos directory (or current directory)"
 
-    publish_path = key(
-        key_name="publish-path",
-        cast=Path,
-        required=False,
-        default=Path("./repos/micropython-stubs/publish"),
-    )
-    "A Path to the folder where all stub publication artifacts are stored"
-
-    template_path = key(
-        key_name="template-path",
-        cast=Path,
-        required=False,
-        default=Path("./repos/micropython-stubs/publish/template"),
-    )
-    "a Path to the publication folder that has the template files"
-
-    stable_version = key(key_name="stable-version", cast=str, required=False, default="1.20.0")
+    stable_version: str = key(key_name="stable-version", cast=str, required=False, default="1.20.0")
 
     "last published stable"
 
@@ -66,25 +49,38 @@ class StubberConfig(Config):
     BLOCKED_PORTS = ["minimal", "bare-arm"]
     "ports that should be ignored as a source of stubs"
 
-    # def __init__(self):
-    #     super().__init__()
-    #     self.update_versions()
+    @property
+    def repos(self) -> List[Path]:
+        "return the repo paths"
+        return [self.mpy_path, self.mpy_lib_path, self.mpy_stubs_path]
+
+    @property
+    def stub_path(self) -> Path:
+        "return the stubs path in the microypthon-stubs repo"
+        return self.mpy_stubs_path / "stubs"
+
+    @property
+    def publish_path(self) -> Path:
+        "return the stubs path in the microypthon-stubs repo"
+        return self.mpy_stubs_path / "publish"
 
-    # def update_versions(self):
-    #     try:
-    #         self.ALL_VERSIONS = git.get_tags(self.mpy_path, minver="v1.17")
-    #     except Exception:
-    #         self.ALL_VERSIONS = ["1.17", "1.18", "1.19", "1.19.1"]
-    #     self.STABLE_VERSION = self.ALL_VERSIONS[-1]
+    @property
+    def template_path(self) -> Path:
+        "return the stubs path in the microypthon-stubs repo"
+        return self.mpy_stubs_path / "publish" / "template"
 
     def post_read_hook(self) -> dict:
         config_updates = {}
         # relative to stubs
-        config_updates.update(fallback_path=self.stub_path / self.fallback_path)
+        # config_updates.update(fallback_path=self.stub_path / self.fallback_path)
 
         # relative to repo path
         config_updates.update(mpy_path=self.repo_path / self.mpy_path)
         config_updates.update(mpy_lib_path=self.repo_path / self.mpy_lib_path)
+        if self.mpy_stubs_path.is_absolute() or self.mpy_stubs_path == Path("."):
+            config_updates.update(mpy_stubs_path=self.mpy_stubs_path)
+        else:
+            config_updates.update(mpy_stubs_path=self.repo_path / self.mpy_stubs_path)
         # read the versions from the git tags
         all_versions = []
         try:
@@ -107,7 +103,7 @@ def readconfig(filename: str = "pyproject.toml", prefix: str = "tool.", must_exi
     while not (path / filename).exists():
         path = path.parent
         if path == path.parent:
-            log.info(f"Could not find config file: {filename}")
+            log.trace(f"Could not find config file: {filename}")
             use_toml = False
             break
 

stubber/utils/repos.py

@@ -107,9 +107,9 @@ def fetch_repos(tag: str, mpy_path: Path, mpy_lib_path: Path):
     git.fetch(mpy_path)
     git.fetch(mpy_lib_path)
     try:
-        git.fetch(CONFIG.stub_path.parent)
+        git.fetch(CONFIG.mpy_stubs_path)
     except Exception:
-        log.trace("no stubs repo found : {CONFIG.stub_path.parent}")
+        log.trace("no stubs repo found : {CONFIG.mpy_stubs_path}")
 
     if not tag:
         tag = V_PREVIEW

stubber/utils/versions.py

@@ -3,6 +3,7 @@
 from pathlib import Path
 
 from github import Github
+from loguru import logger as log
 from packaging.version import parse
 
 import stubber.basicgit as git