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

stubber/commands/get_mcu_cmd.py

@@ -5,7 +5,7 @@
 ##########################################################################################
 
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 from stubber.bulk.mcu_stubber import stub_connected_mcus
@@ -21,7 +21,7 @@ from .cli import stubber_cli
 @stubber_cli.command(name="get-mcu-stubs")
 @click.option(
     "--variant",
-    "-v",
+    # "-v",
     type=click.Choice(["Full", "Mem", "DB"], case_sensitive=False),
     default="DB",
     show_default=True,
@@ -37,7 +37,10 @@ from .cli import stubber_cli
 )
 @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."
+    "--reset/--no-reset",
+    default=False,
+    show_default=True,
+    help="Reset the board before running createstubs.",
 )
 @click.option(
     "--github/--local",
@@ -50,7 +53,9 @@ def cli_create_mcu_stubs(variant: str, format: str, debug: bool, reset: bool, gi
     # 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.")
+            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/commands/merge_cmd.py

@@ -1,9 +1,10 @@
 """
 enrich machinestubs with docstubs
 """
+
 from typing import List, Union
 
-import click
+import rich_click as click
 from loguru import logger as log
 
 from stubber.publish.merge_docstubs import merge_all_docstubs
@@ -17,8 +18,7 @@ from .cli import stubber_cli
 @click.option("--family", default="micropython", type=str, show_default=True)
 @click.option(
     "--version",
-    "--Version",
-    "-V",
+    "-v",
     "versions",
     multiple=True,
     default=["all"],

stubber/commands/publish_cmd.py

@@ -4,7 +4,7 @@ Commandline interface to publish stubs.
 
 from typing import List, Union
 
-import click
+import rich_click as click
 from loguru import logger as log
 from tabulate import tabulate
 
@@ -18,8 +18,7 @@ from stubber.utils.config import CONFIG
 @click.option("--family", default="micropython", type=str, show_default=True)
 @click.option(
     "--version",
-    "--Version",
-    "-V",
+    "-v",
     "versions",
     multiple=True,
     default=[CONFIG.stable_version],

stubber/commands/stub_cmd.py

@@ -1,4 +1,5 @@
 """Create or update .pyi type hint files."""
+
 ##########################################################################################
 # stub
 ##########################################################################################
@@ -7,7 +8,7 @@ from loguru import logger as log
 from pathlib import Path
 from typing import Union
 
-import click
+import rich_click as click
 from stubber.utils import generate_pyi_files
 from stubber.utils.post import do_post_processing
 

stubber/commands/switch_cmd.py

@@ -2,16 +2,15 @@
 switch to a specific version of the micropython repos
 """
 
-
 from pathlib import Path
 from typing import Optional, Union
 
-import click
+import rich_click as click
 
-import stubber.basicgit as git
+import mpflash.basicgit as git
 from stubber.utils.config import CONFIG
 from stubber.utils.repos import fetch_repos, repo_paths
-from stubber.utils.versions import SET_PREVIEW, V_PREVIEW
+from mpflash.versions import SET_PREVIEW, V_PREVIEW
 
 from .cli import stubber_cli
 
@@ -23,7 +22,11 @@ from .cli import stubber_cli
 # get version list from Git tags in the repo that is provided on the command line
 
 try:
-    VERSION_LIST = git.get_tags("micropython/micropython", minver="v1.9.3") + [V_PREVIEW, "latest", "stable"]
+    VERSION_LIST = git.get_tags("micropython/micropython", minver="v1.9.3") + [
+        V_PREVIEW,
+        "latest",
+        "stable",
+    ]
 except Exception:
     # offline fallback
     VERSION_LIST = ["v1.91.1", "v1.20.1", "v1.21.0", "v1.22.1", "preview", "stable"]
@@ -31,7 +34,12 @@ except Exception:
 
 @stubber_cli.command(name="switch")
 @click.argument("tag", required=False, type=click.Choice(VERSION_LIST, case_sensitive=False))
-@click.option("--path", "-p", default=CONFIG.repo_path.as_posix(), type=click.Path(file_okay=False, dir_okay=True))
+@click.option(
+    "--path",
+    "-p",
+    default=CONFIG.repo_path.as_posix(),
+    type=click.Path(file_okay=False, dir_okay=True),
+)
 def cli_switch(path: Union[str, Path], tag: Optional[str] = None):
     """
     Switch to a specific version of the micropython repos.

stubber/commands/variants_cmd.py

@@ -1,7 +1,8 @@
 """Create all variant of createstubs*.py."""
+
 from pathlib import Path
 
-import click
+import rich_click as click
 from loguru import logger as log
 from stubber.utils.config import CONFIG
 from stubber.variants import create_variants
@@ -12,8 +13,7 @@ from .cli import stubber_cli
 
 @click.option(
     "--version",
-    "--Version",
-    "-V",
+    "-v",
     "version",
     default=CONFIG.stable_version,
     show_default=True,

stubber/freeze/get_frozen.py

@@ -25,11 +25,11 @@ from typing import List, Optional
 from loguru import logger as log
 from packaging.version import Version
 
+from mpflash.versions import SET_PREVIEW, V_PREVIEW
 from stubber import utils
 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
-from stubber.utils.versions import SET_PREVIEW, V_PREVIEW
 
 FAMILY = "micropython"
 

stubber/minify.py

@@ -2,6 +2,7 @@
 Processing for createstubs.py
 Minimizes and cross-compiles a MicroPyton file.
 """
+
 import itertools
 import subprocess
 import tempfile
@@ -10,14 +11,14 @@ from io import BytesIO, IOBase, StringIO, TextIOWrapper
 from pathlib import Path
 from typing import List, Tuple, Union
 
-try: 
+try:
     import python_minifier
 except ImportError:
     python_minifier = None
 
 from loguru import logger as log
 
-from stubber.utils.versions import SET_PREVIEW, V_PREVIEW
+from mpflash.versions import SET_PREVIEW, V_PREVIEW
 
 # Type Aliases for minify
 StubSource = Union[Path, str, StringIO, TextIOWrapper]
@@ -243,7 +244,7 @@ def minify_script(source_script: StubSource, keep_report: bool = True, diff: boo
             ],
             # remove_pass=True,  # no dead code
             # convert_posargs_to_args=True, # Does not save any space
-    )
+        )
     len_3 = len(min_source)
     if 1:
         # write to temp file for debugging

stubber/publish/candidates.py

@@ -17,13 +17,13 @@ from typing import Any, Dict, Generator, List, Optional, Union
 from loguru import logger as log
 from packaging.version import parse
 
-import stubber.basicgit as git
+import mpflash.basicgit as git
+from mpflash.versions import OLDEST_VERSION, SET_PREVIEW, V_PREVIEW, clean_version, micropython_versions
 from stubber import utils
 from stubber.publish.defaults import GENERIC, GENERIC_L, GENERIC_U
 
 # from stubber.publish.enums import COMBO_STUBS
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import OLDEST_VERSION, SET_PREVIEW, V_PREVIEW, clean_version, micropython_versions
 
 
 def subfolder_names(path: Path):
@@ -215,9 +215,7 @@ def board_candidates(
         else:
             r = git.checkout_tag(repo=mpy_path, tag=version)
         if not r:
-            log.warning(
-                f"Incorrect version: {version} or did you forget to 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:
@@ -254,9 +252,5 @@ def filter_list(
         worklist = [i for i in worklist if i["port"].lower() in ports_]
     if boards and not is_auto(boards):
         boards_ = [i.lower() for i in boards]
-        worklist = [
-            i
-            for i in worklist
-            if i["board"].lower() in boards_ or i["board"].lower().replace("generic_", "") in boards_
-        ]
+        worklist = [i for i in worklist if i["board"].lower() in boards_ or i["board"].lower().replace("generic_", "") in boards_]
     return worklist

stubber/publish/defaults.py

@@ -1,8 +1,9 @@
 """Build and packaging defaults for stubber"""
+
 from typing import Dict, List
 
+from mpflash.versions import V_PREVIEW, clean_version
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import V_PREVIEW, clean_version
 
 # The default board for the ports modules documented with base name only
 # as the MicroPython BOARD naming convention has changed over time there are different options to try
@@ -29,15 +30,9 @@ def default_board(port: str, version=V_PREVIEW) -> str:  # sourcery skip: assign
     ver_flat = clean_version(version, flat=True)
     if port in DEFAULT_BOARDS:
         for board in DEFAULT_BOARDS[port]:
-            base = (
-                f"micropython-{ver_flat}-{port}-{board}"
-                if board
-                else f"micropython-{ver_flat}-{port}"
-            )
+            base = f"micropython-{ver_flat}-{port}-{board}" if board else f"micropython-{ver_flat}-{port}"
             # check if we have a (merged)stub for this version and port
-            if (CONFIG.stub_path / f"{base}-merged").exists() or (
-                CONFIG.stub_path / base
-            ).exists():
+            if (CONFIG.stub_path / f"{base}-merged").exists() or (CONFIG.stub_path / base).exists():
                 return board
         # fallback to first listed board
         return DEFAULT_BOARDS[port][0]

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

@@ -26,7 +26,6 @@
 # THE SOFTWARE.
 
 from __future__ import print_function
-
 import contextlib
 import os
 import sys
@@ -62,6 +61,9 @@ FILE_TYPE_LOCAL = 1
 # URL to file. (TODO)
 FILE_TYPE_HTTP = 2
 
+# Default list of libraries in micropython-lib to search for library packages.
+BASE_LIBRARY_NAMES = ("micropython", "python-stdlib", "python-ecosys")
+
 
 class ManifestFileError(Exception):
     pass
@@ -106,7 +108,7 @@ class ManifestPackageMetadata:
         self.stdlib = False
 
         # Allows a python-ecosys package to be annotated with the
-        # corresponding name in PyPI. e.g. micropython-lib/urequests is based
+        # corresponding name in PyPI. e.g. micropython-lib/requests is based
         # on pypi/requests.
         self.pypi = None
         # For a micropython package, this is the name that we will publish it
@@ -143,7 +145,7 @@ class ManifestPackageMetadata:
 
         self.description = description
         self.version = version
-        self.license = version
+        self.license = license
         self.author = author
         self.pypi = pypi
         self.pypi_publish = pypi_publish
@@ -194,6 +196,14 @@ class ManifestFile:
         self._visited = set()
         # Stack of metadata for each level.
         self._metadata = [ManifestPackageMetadata()]
+        # Registered external libraries.
+        self._libraries = {}
+        # List of directories to search for packages.
+        self._library_dirs = []
+        # Add default micropython-lib libraries if $(MPY_LIB_DIR) has been specified.
+        if self._path_vars["MPY_LIB_DIR"]:
+            for lib in BASE_LIBRARY_NAMES:
+                self.add_library(lib, os.path.join("$(MPY_LIB_DIR)", lib))
 
     def _resolve_path(self, path):
         # Convert path to an absolute path, applying variable substitutions.
@@ -208,6 +218,7 @@ class ManifestFile:
             "metadata": self.metadata,
             "include": self.include,
             "require": self.require,
+            "add_library": self.add_library,
             "package": self.package,
             "module": self.module,
             "options": IncludeOptions(**kwargs),
@@ -271,13 +282,15 @@ class ManifestFile:
             kind = KIND_COMPILE_AS_MPY
 
         self._manifest_files.append(
-            ManifestOutput(FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, self._metadata[-1], opt)
+            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)
 
-        if files:
+        if files is not None:
             # Use explicit list of files (relative to package_path).
             for file in files:
                 if package_path:
@@ -386,14 +399,23 @@ class ManifestFile:
             if is_require:
                 self._metadata.pop()
 
-    def require(self, name, version=None, unix_ffi=False, pypi=None, **kwargs):
-        """
-        Require a module by name from micropython-lib.
+    def _require_from_path(self, library_path, name, version, extra_kwargs):
+        for root, dirnames, filenames in os.walk(library_path):
+            if os.path.basename(root) == name and "manifest.py" in filenames:
+                self.include(root, is_require=True, **extra_kwargs)
+                return True
+        return False
 
-        Optionally specify unix_ffi=True to use a module from the unix-ffi directory.
+    def require(self, name, version=None, pypi=None, library=None, **kwargs):
+        """
+        Require a package by name from micropython-lib.
 
         Optionally specify pipy="package-name" to indicate that this should
         use the named package from PyPI when building for CPython.
+
+        Optionally specify library="name" to reference a package from a
+        library that has been previously registered with add_library(). Otherwise
+        the list of library paths will be used.
         """
         self._metadata[-1].check_initialised(self._mode)
 
@@ -404,24 +426,41 @@ class ManifestFile:
             self._pypi_dependencies.append(pypi)
             return
 
-        if self._path_vars["MPY_LIB_DIR"]:
-            lib_dirs = ["micropython", "python-stdlib", "python-ecosys"]
-            if unix_ffi:
-                # Search unix-ffi only if unix_ffi=True, and make unix-ffi modules
-                # take precedence.
-                lib_dirs = ["unix-ffi"] + lib_dirs
-
-            for lib_dir in lib_dirs:
-                # Search for {lib_dir}/**/{name}/manifest.py.
-                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
-
-            raise ValueError("Library not found in local micropython-lib: {}".format(name))
-        else:
-            # TODO: HTTP request to obtain URLs from manifest.json.
-            raise ValueError("micropython-lib not available for require('{}').", name)
+        if library is not None:
+            # Find package in external library.
+            if library not in self._libraries:
+                raise ValueError("Unknown library '{}' for require('{}').".format(library, name))
+            library_path = self._libraries[library]
+            # Search for {library_path}/**/{name}/manifest.py.
+            if self._require_from_path(library_path, name, version, kwargs):
+                return
+            raise ValueError(
+                "Package '{}' not found in external library '{}' ({}).".format(
+                    name, library, library_path
+                )
+            )
+
+        for lib_dir in self._library_dirs:
+            # Search for {lib_dir}/**/{name}/manifest.py.
+            if self._require_from_path(lib_dir, name, version, kwargs):
+                return
+
+        raise ValueError("Package '{}' not found in any known library.".format(name))
+
+    def add_library(self, library, library_path, prepend=False):
+        """
+        Register the path to an external named library.
+
+        The path will be automatically searched when using require().  By default the
+        added library is added to the end of the list of libraries to search.  Pass
+        `prepend=True` to add it to the start of the list.
+
+        Additionally, the added library can be explicitly requested by using
+        `require("name", library="library")`.
+        """
+        library_path = self._resolve_path(library_path)
+        self._libraries[library] = library_path
+        self._library_dirs.insert(0 if prepend else len(self._library_dirs), library_path)
 
     def package(self, package_path, files=None, base_path=".", opt=None):
         """
@@ -563,6 +602,9 @@ def main():
         default=os.path.join(os.path.dirname(__file__), "../lib/micropython-lib"),
         help="path to micropython-lib repo",
     )
+    cmd_parser.add_argument(
+        "--unix-ffi", action="store_true", help="prepend unix-ffi to the library path"
+    )
     cmd_parser.add_argument("--port", default=None, help="path to port dir")
     cmd_parser.add_argument("--board", default=None, help="path to board dir")
     cmd_parser.add_argument(
@@ -592,6 +634,8 @@ def main():
         exit(1)
 
     m = ManifestFile(mode, path_vars)
+    if args.unix_ffi:
+        m.add_library("unix-ffi", os.path.join("$(MPY_LIB_DIR)", "unix-ffi"), prepend=True)
     for manifest_file in args.files:
         try:
             m.execute(manifest_file)

stubber/tools/readme.md

@@ -2,5 +2,6 @@ tools vendored from micropython
 
 - manifestfile.py 
   - Micropython manifest file parser 
-  - Micropython 1.19.1
-  - https://github.com/micropython/micropython/blob/master/tools/manifestfile.py
+  - https://github.com/micropython/micropython/blob/master/tools/manifestfile.py
+  - v1.23.0 
+    - https://raw.githubusercontent.com/micropython/micropython/v1.23.0/tools/manifestfile.py

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