micropython-stubber 1.25.1rc5__tar.gz → 1.25.1rc6__tar.gz

{micropython_stubber-1.25.1rc5 → micropython_stubber-1.25.1rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: micropython-stubber
-Version: 1.25.1rc5
+Version: 1.25.1rc6
 Summary: Tooling to create and maintain stubs for MicroPython
 License: MIT
 Keywords: MicroPython,stubs,vscode,pyright,linting,static type check
@@ -25,7 +25,7 @@ Requires-Dist: executing (>=2.0.1,<3.0.0)
 Requires-Dist: importlib-metadata (>=1,<9) ; python_version < "3.8"
 Requires-Dist: libcst (>=1.1.0,<2.0.0)
 Requires-Dist: loguru (>=0.6,<0.8)
-Requires-Dist: mpflash (>=1.25.0.rc2)
+Requires-Dist: mpflash (==1.25.0.rc3)
 Requires-Dist: mpremote (>=1.25.0)
 Requires-Dist: mpy-cross (>=1.25.0.post2,<2.0.0)
 Requires-Dist: mypy (>=1.10)

{micropython_stubber-1.25.1rc5 → micropython_stubber-1.25.1rc6}/pyproject.toml

@@ -8,7 +8,7 @@ repo-path = "./repos"
 
 [tool.poetry]
 name = "micropython-stubber"
-version = "1.25.1.rc5"
+version = "1.25.1.rc6"
 description = "Tooling to create and maintain stubs for MicroPython"
 authors = ["Jos Verlinde <jos_verlinde@hotmail.com>"]
 license = "MIT"
@@ -50,7 +50,7 @@ mpremote = "mpremote.main:main"
 python = ">=3.9.2,<4.0"
 python-minifier = { version = "^2.7.0", python = "<3.14" }
 requests = "^2.32.3"
-mpflash = ">=1.25.0.rc2"
+mpflash = "==1.25.0.rc3"
 mpremote = ">=1.25.0"
 # others
 autoflake = ">=1.7,<3.0"

{micropython_stubber-1.25.1rc5 → micropython_stubber-1.25.1rc6}/src/stubber/rst/lookup.py

@@ -445,6 +445,12 @@ PARAM_FIXES = [
         "(ip, subnet, gateway, dns):Optional[Any]=None",
         "configtuple: Optional[Tuple]",
     ),
+    # network.ipconfig
+    Fix(
+        "param=value",
+        "param:Optional[str]=None",
+        name="ipconfig",
+    ),
     # framebuffer
     # unresolvable parameter defaults # FrameBuffer: def __init__
     Fix(

{micropython_stubber-1.25.1rc5 → micropython_stubber-1.25.1rc6}/src/stubber/rst/reader.py

@@ -69,10 +69,19 @@ from typing import List, Optional, Tuple
 
 from mpflash.logger import log
 from mpflash.versions import V_PREVIEW
-from stubber.rst import (CHILD_PARENT_CLASS, MODULE_GLUE, PARAM_FIXES,
-                         PARAM_RE_FIXES, RST_DOC_FIXES, TYPING_IMPORT,
-                         ClassSourceDict, FunctionSourceDict, ModuleSourceDict,
-                         return_type_from_context)
+
+from stubber.rst import (
+    CHILD_PARENT_CLASS,
+    MODULE_GLUE,
+    PARAM_FIXES,
+    PARAM_RE_FIXES,
+    RST_DOC_FIXES,
+    TYPING_IMPORT,
+    ClassSourceDict,
+    FunctionSourceDict,
+    ModuleSourceDict,
+    return_type_from_context,
+)
 from stubber.rst.lookup import Fix
 from stubber.utils.config import CONFIG
 
@@ -496,8 +505,8 @@ class RSTParser(RSTReader):
                 self.read_file(file_path)
                 self.parse()
         # reset this file to done
-        self.rst_text = []
-        self.line_no = 1
+        # self.rst_text = []
+        # self.line_no = 1
 
     def parse_module(self):
         "parse a module tag and set the module's docstring"

{micropython_stubber-1.25.1rc5 → micropython_stubber-1.25.1rc6}/src/stubber/stubs_from_docs.py

@@ -78,23 +78,11 @@ def get_rst_sources(rst_path: Path, pattern: str) -> List[Path]:
 def make_docstubs(
     dst_path: Path, v_tag: str, release: str, suffix: str, files: List[Path], clean_rst: bool
 ):
-    """Create the docstubs"""
+    """Create docstubs from the list of rst files"""
 
     for file in files:
-        reader = RSTWriter(v_tag)
-        reader.clean_rst = clean_rst
-        reader.source_release = release
-        log.debug(f"Reading: {file}")
-        reader.read_file(file)
-        reader.parse()
-        # Destination = "module.__init__.pyi"
-        if "." in file.stem:
-            target = dst_path / f"{(file.stem).replace('.', '/')}{suffix}"
-        else:
-            target = dst_path / file.stem / f"__init__{suffix}"
-        # fname = (dst_path / file.name).with_suffix(suffix)
-        reader.write_file(target)
-        del reader
+        make_docstub(file, dst_path, v_tag, release, suffix, clean_rst)
+
     for name in U_MODULES:
         # create a file "umodule.pyi" for each module
         # and add a line : from module import *
@@ -107,3 +95,28 @@ def make_docstubs(
             f.write("# Allow the use of micro-module notation \n\n")
             f.write(f"from {name} import *  # type: ignore\n")
             f.flush()
+
+
+def make_docstub(
+    file: Path,
+    dst_path: Path,
+    v_tag: str,
+    release: str,
+    suffix: str,
+    clean_rst: bool,
+):
+    """Create a docstub from a single rst file"""
+    reader = RSTWriter(v_tag)
+    reader.clean_rst = clean_rst
+    reader.source_release = release
+    log.debug(f"Reading: {file}")
+    reader.read_file(file)
+    reader.parse()
+
+    if "." in file.stem:
+        target = dst_path / f"{(file.stem).replace('.', '/')}{suffix}"
+    else:
+        target = dst_path / file.stem / f"__init__{suffix}"
+
+    reader.write_file(target)
+    del reader