micropython-stubber 1.16.2__py3-none-any.whl → 1.17.0__py3-none-any.whl

stubber/freeze/freeze_manifest_2.py

@@ -57,7 +57,8 @@ def freeze_one_manifest_2(manifest: Path, frozen_stub_path: Path, mpy_path: Path
     # so we need to get the port and board from the path
     log.info(f"input_manifest: {manifest}")
     port, board = get_portboard(manifest)
-    log.info(f"port-board: '{port}-{board}'")
+
+    log.info("port-board: {}".format((port + "-" +board).rstrip("-")))
 
     path_vars = make_path_vars(port=port, board=board, mpy_path=mpy_path, mpy_lib_path=mpy_lib_path)
     upy_manifest = ManifestFile(MODE_FREEZE, path_vars)

stubber/freeze/get_frozen.py

@@ -24,14 +24,15 @@ 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
-from stubber.codemod.add_comment import AddComment
-
+from stubber.utils.versions import SET_PREVIEW, V_PREVIEW
 
-# globals
 FAMILY = "micropython"
 
 
@@ -54,13 +55,18 @@ def add_comment_to_path(path: Path, comment: str) -> None:
     Add a comment to the top of each file in the path
     using a codemod
     """
-    #TODO: #305 add comment line to each file with the micropython version it was generated from
+    # TODO: #305 add comment line to each file with the micropython version it was generated from
     # frozen_stub_path
     # python -m libcst.tool codemod --include-stubs --no-format  add_comment.AddComment .\repos\micropython-stubs\stubs\micropython-v1_19_1-frozen\ --comment "# Micropython 1.19.1 frozen stubs"
     pass
 
 
-def freeze_any(stub_folder: Path, version: str, mpy_path: Optional[Path] = None, mpy_lib_path: Optional[Path] = None) -> int:
+def freeze_any(
+    stub_folder: Optional[Path] = None,
+    version: str = V_PREVIEW,
+    mpy_path: Optional[Path] = None,
+    mpy_lib_path: Optional[Path] = None,
+) -> Path:
     """
     Get and parse the to-be-frozen .py modules for micropython to extract the static type information
      - requires that the MicroPython and Micropython-lib repos are checked out and available on a local path
@@ -73,24 +79,24 @@ def freeze_any(stub_folder: Path, version: str, mpy_path: Optional[Path] = None,
     current_dir = os.getcwd()
     mpy_path = Path(mpy_path).absolute() if mpy_path else CONFIG.mpy_path.absolute()
     mpy_lib_path = Path(mpy_lib_path).absolute() if mpy_lib_path else CONFIG.mpy_path.absolute()
-    if not stub_folder:
-        frozen_stub_path = Path("{}/{}_{}_frozen".format(CONFIG.stub_path, FAMILY, utils.clean_version(version, flat=True))).absolute()
-    else:
-        frozen_stub_path: Path = Path(stub_folder).absolute()
 
     # if old version of micropython, use the old freeze method
-    if version not in ["master", "latest"] and Version(version) <= Version("1.11"):
+    if version not in SET_PREVIEW and Version(version) <= Version("1.11"):
+        frozen_stub_path = get_fsp(version, stub_folder)
         log.debug("MicroPython v1.11, older or other")
         # others
         modules = freeze_folders(frozen_stub_path.as_posix(), mpy_path.as_posix(), mpy_lib_path.as_posix(), version)
         count = len(modules)
     else:
+        # get the current checked out version
+        version = utils.checkedout_version(CONFIG.mpy_path)
+
+        frozen_stub_path = get_fsp(version, stub_folder)
         # get the manifests of the different ports and boards
         all_manifests = get_manifests(mpy_path)
 
         # process all_manifests under the ports folder and update the frozen files in the stubs folder
-        # we are goning to jump around, avoid relative paths
-        frozen_stub_path = frozen_stub_path.absolute()
+        # we are going to jump around, avoid relative paths
         mpy_path = mpy_path.absolute()
         mpy_lib_path = mpy_lib_path.absolute()
 
@@ -111,4 +117,13 @@ def freeze_any(stub_folder: Path, version: str, mpy_path: Optional[Path] = None,
 
     # restore cwd
     os.chdir(current_dir)
-    return count
+    return frozen_stub_path
+
+
+def get_fsp(version: str, stub_folder: Optional[Path] = None) -> Path:
+    if not stub_folder:
+        frozen_stub_path = CONFIG.stub_path / f"{FAMILY}-{utils.clean_version(version, flat=True)}-frozen"
+        frozen_stub_path = frozen_stub_path.absolute()
+    else:
+        frozen_stub_path: Path = Path(stub_folder).absolute()
+    return frozen_stub_path

stubber/minify.py

@@ -13,6 +13,8 @@ from typing import List, Tuple, Union
 import python_minifier
 from loguru import logger as log
 
+from stubber.utils.versions import SET_PREVIEW, V_PREVIEW
+
 # Type Aliases for minify
 StubSource = Union[Path, str, StringIO, TextIOWrapper]
 XCompileDest = Union[Path, BytesIO]
@@ -192,19 +194,62 @@ def minify_script(source_script: StubSource, keep_report: bool = True, diff: boo
 
     source_content = ""
     if isinstance(source_script, Path):
-        source_content = source_script.read_text()
+        source_content = source_script.read_text(encoding="utf-8")
     elif isinstance(source_script, (StringIO, TextIOWrapper)):
         source_content = "".join(source_script.readlines())
     elif isinstance(source_script, str):  # type: ignore
         source_content = source_script
     else:
-        raise TypeError(
-            f"source_script must be str, Path, or file-like object, not {type(source_script)}"
-        )
+        raise TypeError(f"source_script must be str, Path, or file-like object, not {type(source_script)}")
 
     if not source_content:
         raise ValueError("No source content")
+    len_1 = len(source_content)
+
+    if 0:
+        min_source = reduce_log_print(keep_report, diff, source_content)
+    else:
+        min_source = source_content
+    len_2 = len(min_source)
+
+    min_source = python_minifier.minify(
+        min_source,
+        filename=getattr(source_script, "name", None),
+        combine_imports=True,
+        remove_literal_statements=True,  # no Docstrings
+        remove_annotations=True,  # not used runtime anyways
+        hoist_literals=True,  # remove redundant strings
+        rename_locals=True,  # short names save memory
+        preserve_locals=["stubber", "path"],  # names to keep
+        rename_globals=True,  # short names save memory
+        # keep these globals to allow testing/mocking to work against the minified not compiled version
+        preserve_globals=[
+            "main",
+            "Stubber",
+            "read_path",
+            "get_root",
+            "_info",
+            "os",
+            "sys",
+            "__version__",
+        ],
+        # 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
+        with open("tmp_minified.py", "w+") as f:
+            f.write(min_source)
+
+    log.info(f"Original length : {len_1}")
+    log.info(f"Reduced length  : {len_2}")
+    log.info(f"Minified length : {len_3}")
+    log.info(f"Reduced by      : {len_1-len_3} ")
+    return min_source
 
+
+def reduce_log_print(keep_report, diff, source_content):
     edits: LineEdits = [
         ("keepprint", "print('Debug: "),
         ("keepprint", "print('DEBUG: "),
@@ -250,40 +295,7 @@ def minify_script(source_script: StubSource, keep_report: bool = True, diff: boo
         ] + edits
 
     content = edit_lines(source_content, edits, diff=diff)
-
-    if 1:
-        # write to temp file for debugging
-        with open("tmp_minified.py", "w+") as f:
-            f.write(content)
-
-    source = python_minifier.minify(
-        content,
-        filename=getattr(source_script, "name", None),
-        combine_imports=True,
-        remove_literal_statements=True,  # no Docstrings
-        remove_annotations=True,  # not used runtime anyways
-        hoist_literals=True,  # remove redundant strings
-        rename_locals=True,  # short names save memory
-        preserve_locals=["stubber", "path"],  # names to keep
-        rename_globals=True,  # short names save memory
-        # keep these globals to allow testing/mocking to work against the minified not compiled version
-        preserve_globals=[
-            "main",
-            "Stubber",
-            "read_path",
-            "get_root",
-            "_info",
-            "os",
-            "sys",
-            "__version__",
-        ],
-        # remove_pass=True,  # no dead code
-        # convert_posargs_to_args=True, # Does not save any space
-    )
-    log.debug(f"Original length : {len(content)}")
-    log.info(f"Minified length : {len(source)}")
-    log.info(f"Reduced by      : {len(content)-len(source)} ")
-    return source
+    return content
 
 
 def minify(
@@ -347,11 +359,10 @@ def cross_compile(
     else:
         # target must be a Path object
         _target = get_temp_file(suffix=".mpy")
-
     result = pipx_mpy_cross(version, source_file, _target)
     if result.stderr and "No matching distribution found for mpy-cross==" in result.stderr:
         log.warning(f"mpy-cross=={version} not found, using latest")
-        result = pipx_mpy_cross("latest", source_file, _target)
+        result = pipx_mpy_cross(V_PREVIEW, source_file, _target)
 
     if result.returncode == 0:
         log.debug(f"mpy-cross compiled to    : {_target.name}")
@@ -367,9 +378,11 @@ def cross_compile(
     return result.returncode
 
 
-def pipx_mpy_cross(version, source_file, _target):
+def pipx_mpy_cross(version: str, source_file, _target):
     """Run mpy-cross using pipx"""
-    if version == "latest":
+
+    log.info(f"Compiling with mpy-cross version: {version}")
+    if version in SET_PREVIEW:
         version = ""
     if version:
         version = "==" + version
@@ -378,7 +391,7 @@ def pipx_mpy_cross(version, source_file, _target):
     # Add params
     cmd += ["-O2", str(source_file), "-o", str(_target), "-s", "createstubs.py"]
     log.trace(" ".join(cmd))
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    result = subprocess.run(cmd, capture_output=True, text=True, encoding="utf-8")  # Specify the encoding
     return result
 
 

stubber/publish/candidates.py

@@ -10,7 +10,6 @@ what versions are available. This module provides functions to :
     - get a list of the firmware/board stubs (firmware candidates)
 """
 
-
 import re
 from pathlib import Path
 from typing import Any, Dict, Generator, List, Optional, Union
@@ -18,15 +17,11 @@ from typing import Any, Dict, Generator, List, Optional, Union
 from packaging.version import parse
 
 import stubber.basicgit as git
-from stubber.publish.enums import COMBO_STUBS, DOC_STUBS, FIRMWARE_STUBS
+from stubber import utils
 from stubber.publish.defaults import GENERIC, GENERIC_L, GENERIC_U
+from stubber.publish.enums import COMBO_STUBS, DOC_STUBS, FIRMWARE_STUBS
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import clean_version, micropython_versions
-
-OLDEST_VERSION = "1.16"
-"This is the oldest MicroPython version to build the stubs on"
-
-V_LATEST = "latest"
+from stubber.utils.versions import OLDEST_VERSION, SET_PREVIEW, V_PREVIEW, clean_version, micropython_versions
 
 
 def subfolder_names(path: Path):
@@ -50,13 +45,13 @@ def version_candidates(
         for name in subfolder_names(path):
             if match := re.match(folder_re, name):
                 folder_ver = clean_version(match[1])
-                if folder_ver == V_LATEST or parse(folder_ver) >= parse(oldest):
+                if folder_ver == V_PREVIEW or parse(folder_ver) >= parse(oldest):
                     yield folder_ver
 
 
 def list_frozen_ports(
     family: str = "micropython",
-    version: str = V_LATEST,
+    version: str = V_PREVIEW,
     path: Path = CONFIG.stub_path,
 ):
     "get list of ports with frozen stubs for a given family and version"
@@ -94,7 +89,7 @@ def list_micropython_port_boards(
 
 def frozen_candidates(
     family: str = "micropython",
-    versions: Union[str, List[str]] = V_LATEST,
+    versions: Union[str, List[str]] = V_PREVIEW,
     ports: Union[str, List[str]] = "all",
     boards: Union[str, List[str]] = "all",
     *,
@@ -111,7 +106,7 @@ def frozen_candidates(
     auto_port = is_auto(ports)
     auto_board = is_auto(boards)
     if is_auto(versions):
-        versions = list(version_candidates(suffix="frozen", prefix=family, path=path)) + [V_LATEST]
+        versions = list(version_candidates(suffix="frozen", prefix=family, path=path)) + [V_PREVIEW]
     else:
         versions = [versions] if isinstance(versions, str) else versions
 
@@ -129,9 +124,7 @@ def frozen_candidates(
                 # lookup the (frozen) micropython ports
                 ports = list_frozen_ports(family, version, path=path)
             else:
-                raise NotImplementedError(
-                    f"auto ports not implemented for family {family}"
-                )  # pragma: no cover
+                raise NotImplementedError(f"auto ports not implemented for family {family}")  # pragma: no cover
             # elif family == "pycom":
             #     ports = ["esp32"]
             # elif family == "lobo":
@@ -164,9 +157,7 @@ def frozen_candidates(
 
                 else:
                     # raise NotImplementedError(f"auto boards not implemented for family {family}")  # pragma: no cover
-                    raise NotImplementedError(
-                        f"auto boards not implemented for family {family}"
-                    )  # pragma: no cover
+                    raise NotImplementedError(f"auto boards not implemented for family {family}")  # pragma: no cover
                 # elif family == "pycom":
                 #     boards = ["wipy", "lopy", "gpy", "fipy"]
             # ---------------------------------------------------------------------------
@@ -199,7 +190,7 @@ def is_auto(thing: Union[None, str, List[str]]):
 
 def docstub_candidates(
     family: str = "micropython",
-    versions: Union[str, List[str]] = V_LATEST,
+    versions: Union[str, List[str]] = V_PREVIEW,
     path: Path = CONFIG.stub_path,
 ):
     """
@@ -220,7 +211,7 @@ def docstub_candidates(
 
 def board_candidates(
     family: str = "micropython",
-    versions: Union[str, List[str]] = V_LATEST,
+    versions: Union[str, List[str]] = V_PREVIEW,
     *,
     mpy_path: Path = CONFIG.mpy_path,
     pt: str = FIRMWARE_STUBS,
@@ -237,8 +228,10 @@ def board_candidates(
 
     for version in versions:
         # check out the micropython repo for this version
-        if version in ["latest", "master"]:
+        if version in SET_PREVIEW:
             r = git.switch_branch(repo=mpy_path, branch="master")
+            # get the current checked out version
+            version = utils.checkedout_version(mpy_path)
         else:
             r = git.checkout_tag(repo=mpy_path, tag=version)
         if not r:
@@ -283,7 +276,6 @@ def filter_list(
         worklist = [
             i
             for i in worklist
-            if i["board"].lower() in boards_
-            or i["board"].lower().replace("generic_", "") in boards_
+            if i["board"].lower() in boards_ or i["board"].lower().replace("generic_", "") in boards_
         ]
     return worklist

stubber/publish/defaults.py

@@ -2,7 +2,7 @@
 from typing import Dict, List
 
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import clean_version
+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
@@ -24,7 +24,7 @@ GENERIC = {GENERIC_L, GENERIC_U}
 "GENERIC eithercase"
 
 
-def default_board(port: str, version="latest") -> str:  # sourcery skip: assign-if-exp
+def default_board(port: str, version=V_PREVIEW) -> str:  # sourcery skip: assign-if-exp
     """Return the default board for the given version and port"""
     ver_flat = clean_version(version, flat=True)
     if port in DEFAULT_BOARDS:

stubber/publish/merge_docstubs.py

@@ -49,9 +49,7 @@ def merge_all_docstubs(
     for candidate in candidates:
         # use the default board for the port
         if candidate["board"] in GENERIC:
-            candidate["board"] = default_board(
-                port=candidate["port"], version=candidate["version"]
-            )
+            candidate["board"] = default_board(port=candidate["port"], version=candidate["version"])
         # check if we have board stubs of this version and port
         doc_path = CONFIG.stub_path / f"{get_base(candidate)}-docstubs"
         # src and dest paths
@@ -120,13 +118,13 @@ def copy_and_merge_docstubs(fw_path: Path, dest_path: Path, docstub_path: Path):
         "pycopy_imphook",  # is not intended to be used directly, and has an unresolved subclass
     ]:
         for suffix in [".py", ".pyi"]:
-            if (dest_path / name).with_suffix(suffix).exists():
-                (dest_path / name).with_suffix(suffix).unlink()
+            if (dest_path / name).with_suffix(suffix).exists():  # type: ignore
+                (dest_path / name).with_suffix(suffix).unlink()  # type: ignore
 
     # 2 - Enrich the firmware stubs with the document stubs
     result = enrich_folder(dest_path, docstub_path=docstub_path, write_back=True)
 
     # copy the docstubs manifest.json file to the package folder
-    # if (docstub_path / "modules.json").exists():
-    shutil.copy(docstub_path / "modules.json", dest_path / "doc_stubs.json")
+    if (docstub_path / "modules.json").exists():
+        shutil.copy(docstub_path / "modules.json", dest_path / "doc_stubs.json")
     return result

stubber/publish/missing_class_methods.py

@@ -27,7 +27,7 @@ def add_machine_pin_call(merged_path: Path, version: str):
         log.error(f"no docstubs found for {version}")
         return False
     log.trace(f"Parsing {mod_path} for __call__ method")
-    source = mod_path.read_text()
+    source = mod_path.read_text(encoding="utf-8")
     module = cst.parse_module(source)
 
     call_finder = CallFinder()
@@ -40,7 +40,7 @@ def add_machine_pin_call(merged_path: Path, version: str):
     # then use the CallAdder to add the __call__ method to all machine and pyb stubs
     mod_paths = [f for f in merged_path.rglob("*.*") if f.stem in {"machine", "umachine", "pyb"}]
     for mod_path in mod_paths:
-        source = mod_path.read_text()
+        source = mod_path.read_text(encoding="utf-8")
         machine_module = cst.parse_module(source)
         new_module = machine_module.visit(CallAdder(call_finder.call_meth))
         mod_path.write_text(new_module.code)

stubber/publish/pathnames.py

@@ -11,7 +11,7 @@ from loguru import logger as log
 from stubber.publish.defaults import default_board
 from stubber.publish.package import GENERIC
 from stubber.utils.config import CONFIG
-from stubber.utils.versions import clean_version
+from stubber.utils.versions import V_PREVIEW, clean_version
 
 
 ## Helper functions
@@ -40,7 +40,7 @@ def board_folder_name(fw: Dict, *, version: Optional[str] = None) -> str:
 
 def get_board_path(candidate: Dict) -> Path:
     board_path = CONFIG.stub_path / board_folder_name(candidate)
-    if candidate["version"] == "latest" and not board_path.exists():
+    if V_PREVIEW in candidate["version"] and not board_path.exists():
         log.debug(f"no board stubs found for {candidate['version']}, trying stable")
         board_path = CONFIG.stub_path / board_folder_name(candidate, version=CONFIG.stable_version)
 

stubber/publish/publish.py

@@ -13,11 +13,12 @@ from stubber.publish.defaults import GENERIC_U
 from stubber.publish.enums import COMBO_STUBS
 from stubber.publish.package import get_package
 from stubber.utils.config import CONFIG
+from stubber.utils.versions import V_PREVIEW
 
 
 def build_multiple(
     family: str = "micropython",
-    versions: List[str] = ["v1.19.1"],
+    versions: List[str] = [V_PREVIEW],
     ports: List[str] = ["all"],
     boards: List[str] = [GENERIC_U],
     production: bool = False,

stubber/publish/stubpackage.py

@@ -29,7 +29,7 @@ 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 clean_version
+from stubber.utils.versions import SET_PREVIEW, V_PREVIEW, clean_version
 
 Status = NewType("Status", Dict[str, Union[str, None]])
 StubSources = List[Tuple[StubSource, Path]]
@@ -108,7 +108,7 @@ class VersionedPackage(object):
             return self._get_next_package_version(production)
 
     def is_preview(self):
-        return self.mpy_version == "latest" or "preview" in self.mpy_version
+        return self.mpy_version in SET_PREVIEW or V_PREVIEW in self.mpy_version
 
     def _get_next_preview_package_version(self, production: bool = False) -> str:
         """
@@ -125,17 +125,9 @@ class VersionedPackage(object):
         parts = describe.split("-", 3)
         ver = parts[0]
         if len(parts) > 1:
-            rc = (
-                parts[1]
-                if parts[1].isdigit()
-                else parts[2]
-                if len(parts) > 2 and parts[2].isdigit()
-                else 1
-            )
+            rc = parts[1] if parts[1].isdigit() else parts[2] if len(parts) > 2 and parts[2].isdigit() else 1
         rc = int(rc)
-        base = (
-            bump_version(Version(ver), minor_bump=True) if parts[1] != "preview" else Version(ver)
-        )
+        base = bump_version(Version(ver), minor_bump=True) if parts[1] != V_PREVIEW else Version(ver)
         return str(bump_version(base, rc=rc))
         # raise ValueError("cannot determine next version number micropython")
 
@@ -312,9 +304,7 @@ class Builder(VersionedPackage):
             # Check if all stub source folders exist
             for stub_type, src_path in self.stub_sources:
                 if not (CONFIG.stub_path / src_path).exists():
-                    raise FileNotFoundError(
-                        f"Could not find stub source folder {CONFIG.stub_path / src_path}"
-                    )
+                    raise FileNotFoundError(f"Could not find stub source folder {CONFIG.stub_path / src_path}")
 
             # 1 - Copy  the stubs to the package, directly in the package folder (no folders)
             # for stub_type, fw_path in [s for s in self.stub_sources]:
@@ -325,9 +315,7 @@ class Builder(VersionedPackage):
                     self.copy_folder(stub_type, src_path)
                 except OSError as e:
                     if stub_type != StubSource.FROZEN:
-                        raise FileNotFoundError(
-                            f"Could not find stub source folder {src_path}"
-                        ) from e
+                        raise FileNotFoundError(f"Could not find stub source folder {src_path}") from e
                     else:
                         log.debug(f"Error copying stubs from : {CONFIG.stub_path / src_path}, {e}")
         finally:
@@ -594,7 +582,7 @@ class PoetryBuilder(Builder):
         with open(_toml, "rb") as f:
             pyproject = tomllib.load(f)
         ver = pyproject["tool"]["poetry"]["version"]
-        return str(parse(ver)) if ver != "latest" else ver
+        return str(parse(ver)) if ver not in SET_PREVIEW else ver
 
     @pkg_version.setter
     def pkg_version(self, version: str) -> None:
@@ -654,6 +642,7 @@ class PoetryBuilder(Builder):
                 # stdout=subprocess.PIPE,
                 stdout=subprocess.PIPE,  # interestingly: errors on stdout , output on stderr .....
                 universal_newlines=True,
+                encoding="utf-8",
             )
             log.trace(f"poetry {parameters} completed")
         except (NotADirectoryError, FileNotFoundError) as e:  # pragma: no cover # InvalidVersion
@@ -718,8 +707,7 @@ class PoetryBuilder(Builder):
         _pyproject = self.pyproject
         assert _pyproject is not None, "No pyproject.toml file found"
         _pyproject["tool"]["poetry"]["packages"] = [
-            {"include": p.relative_to(self.package_path).as_posix()}
-            for p in sorted((self.package_path).rglob("*.pyi"))
+            {"include": p.relative_to(self.package_path).as_posix()} for p in sorted((self.package_path).rglob("*.pyi"))
         ]
         # write out the pyproject.toml file
         self.pyproject = _pyproject
@@ -862,9 +850,7 @@ class StubPackage(PoetryBuilder):
         # check if the sources exist
         ok = self.are_package_sources_available()
         if not ok:
-            log.debug(
-                f"{self.package_name}: skipping as one or more source stub folders are missing"
-            )
+            log.debug(f"{self.package_name}: skipping as one or more source stub folders are missing")
             self.status["error"] = "Skipped, stub folder(s) missing"
             shutil.rmtree(self.package_path.as_posix())
             self._publish = False  # type: ignore
@@ -886,9 +872,7 @@ class StubPackage(PoetryBuilder):
         self,
         production: bool,  # PyPI or Test-PyPi - USED TO FIND THE NEXT VERSION NUMBER
         force=False,  # BUILD even if no changes
-    ) -> (
-        bool
-    ):  # sourcery skip: default-mutable-arg, extract-duplicate-method, require-parameter-annotation
+    ) -> bool:  # sourcery skip: default-mutable-arg, extract-duplicate-method, require-parameter-annotation
         """
         Build a package
         look up the previous package version in the dabase
@@ -908,14 +892,14 @@ class StubPackage(PoetryBuilder):
             if not self.status["error"]:
                 self.status["error"] = "Could not build/update package"
             return False
-        # If there are changes to the package, then publish it
-        if self.is_changed():
-            log.info(f"Found changes to package sources: {self.package_name} {self.pkg_version} ")
-            log.trace(f"Old hash {self.hash} != New hash {self.calculate_hash()}")
-        elif force:
-            log.info(f"Force build: {self.package_name} {self.pkg_version} ")
 
+        # If there are changes to the package, then publish it
         if self.is_changed() or force:
+            if force:
+                log.info(f"Force build: {self.package_name} {self.pkg_version} ")
+            else:
+                log.info(f"Found changes to package sources: {self.package_name} {self.pkg_version} ")
+                log.trace(f"Old hash {self.hash} != New hash {self.calculate_hash()}")
             #  Build the distribution files
             old_ver = self.pkg_version
             self.pkg_version = self.next_package_version(production)
@@ -975,10 +959,8 @@ class StubPackage(PoetryBuilder):
         self.next_package_version(production=production)
         # Publish the package to PyPi, Test-PyPi or Github
         if self.is_changed():
-            if self.mpy_version == "latest" and production and not force:
-                log.warning(
-                    "version: `latest` package will only be available on Github, and not published to PyPi."
-                )
+            if self.mpy_version in SET_PREVIEW and production and not force:
+                log.warning("version: `latest` package will only be available on Github, and not published to PyPi.")
                 self.status["result"] = "Published to GitHub"
             else:
                 return self.publish_distribution(dry_run, production, db)
@@ -1007,9 +989,7 @@ class StubPackage(PoetryBuilder):
         if not dry_run:
             pub_ok = self.poetry_publish(production=production)
         else:
-            log.warning(
-                f"{self.package_name}: Dry run, not publishing to {'' if production else 'Test-'}PyPi"
-            )
+            log.warning(f"{self.package_name}: Dry run, not publishing to {'' if production else 'Test-'}PyPi")
             pub_ok = True
         if not pub_ok:
             log.warning(f"{self.package_name}: Publish failed for {self.pkg_version}")

stubber/rst/lookup.py

@@ -20,6 +20,7 @@ __all__ = [
 
 # all possible Types needed for the stubs - exxess types should be removed later , and otherwise won't do much harm
 TYPING_IMPORT: List[str] = [
+    "from __future__ import annotations",
     "from typing import IO, Any, Callable, Coroutine, Dict, Generator, Iterator, List, NoReturn, Optional, Tuple, Union, NamedTuple, TypeVar",
     "from _typeshed import Incomplete",
 ]
@@ -483,17 +484,18 @@ PARAM_FIXES = [
 # List of classes and their parent classes that should be added to the class definition
 CHILD_PARENT_CLASS = {
     # machine
-    # "SoftSPI": "SPI", # BUG: SoftSPI is defined before SPI, so baseclass is not yet available
+    # SoftSPI is defined before SPI, so baseclass is not yet available - but in a .pyi that is OK 
+    "SoftSPI": "SPI",  
     "SoftI2C": "I2C",
     "Switch": "Pin",
     "Signal": "Pin",
     # uio # unclear regarding deprecation in python 3.12
     # "IOBase": "IO",  # DOCME  not in documentation
-    "TextIOWrapper": "IO",
-    "FileIO": "IO",
-    "StringIO": "IO",
-    "BytesIO": "IO",
-    "BufferedWriter": "IOBase",  # DOCME: not in documentation
+    "TextIOWrapper": "IO", # "TextIOBase, TextIO",  # based on Stdlib
+    "FileIO": "IO", #  "RawIOBase, BinaryIO",  # based on Stdlib
+    "StringIO": "IO", #  "BufferedIOBase, BinaryIO",  # based on Stdlib
+    "BytesIO": "IO", # "BufferedIOBase, BinaryIO",  # based on Stdlib
+    "BufferedWriter": "IOBase",  # DOCME: not in documentation #   "BufferedWriter": "BufferedIOBase",  # based on Stdlib
     # uzlib
     # "DecompIO": "IO",  # https://docs.python.org/3/library/typing.html#other-concrete-types
     # -------------------------------------------------------------------------------------
@@ -512,7 +514,7 @@ CHILD_PARENT_CLASS = {
     "namedtuple": "tuple",
     "deque": "stdlib_deque",
     # ESPNow
-    "ESPNow": "ESPNowBase,Iterator", # causes issue with mypy 
+    "ESPNow": "ESPNowBase,Iterator",  # causes issue with mypy
     "AIOESPNow": "ESPNow",
     # array
     "array": "List",