micropython-stubber 1.25.0.post2__py3-none-any.whl → 1.25.0rc5__py3-none-any.whl

{micropython_stubber-1.25.0.post2.dist-info → micropython_stubber-1.25.0rc5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: micropython-stubber
-Version: 1.25.0.post2
+Version: 1.25.0rc5
 Summary: Tooling to create and maintain stubs for MicroPython
 License: MIT
 Keywords: MicroPython,stubs,vscode,pyright,linting,static type check
@@ -25,12 +25,12 @@ 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)
+Requires-Dist: mpflash (>=1.25.0.rc2)
 Requires-Dist: mpremote (>=1.25.0)
+Requires-Dist: mpy-cross (>=1.25.0.post2,<2.0.0)
 Requires-Dist: mypy (>=1.10)
 Requires-Dist: mypy-gitlab-code-quality (>=1.1.0,<2.0.0)
 Requires-Dist: packaging (>=24.2,<25.0)
-Requires-Dist: pipx (>=1.1.0,<2.0.0)
 Requires-Dist: poetry (>=2.0.1,<3.0.0)
 Requires-Dist: pydeps (==3.0.1)
 Requires-Dist: pygithub (>=2.1.1,<3.0.0)

{micropython_stubber-1.25.0.post2.dist-info → micropython_stubber-1.25.0rc5.dist-info}/RECORD

@@ -34,7 +34,7 @@ stubber/codemod/enrich.py,sha256=YB-tXo_UjeVboG2uPAG8d1g81STdhWL4NvCfZ6YPduk,129
 stubber/codemod/merge_docstub.py,sha256=XTvsw4BetCRU1-dJlQisVdDx03ldBh7Yc7aREmLiJPs,27956
 stubber/codemod/modify_list.py,sha256=xrpFBKug273D9E02owUheZD418BvsIHIZCFj4YDjTxU,2118
 stubber/codemod/utils.py,sha256=3hk7pwyS4KZxewrWLwbOrdA5ympbum-kfL0ZN-M7rlo,2459
-stubber/codemod/visitors/type_helpers.py,sha256=UdYKsKDTqzHmPNBuWK1lY0sboXrm7RIY0B4FHLtWo3s,10572
+stubber/codemod/visitors/type_helpers.py,sha256=F7Xc_f7yp5szg18bf90oew2SpfZlDKK8EdZ3CcvuL2g,11027
 stubber/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/commands/build_cmd.py,sha256=Zseci4EHxJuiiy7YS-ucmMokDrVLe4j6fPs-PSbwq1k,2813
 stubber/commands/cli.py,sha256=HY4CqB0PPTmzew2sABNsHeNKDPblcGzzbmvtF46oVsU,1556
@@ -64,7 +64,7 @@ stubber/freeze/get_frozen.py,sha256=ojxUO-Fiy-Tn49Tv_puQrBtZ0dxQEmWj2HfWmHmGODQ,
 stubber/get_cpython.py,sha256=Qnug4TlytwrqBRXCNGnRIMGW63zVcQL_8Ua93eTbrc8,3885
 stubber/get_lobo.py,sha256=jyysWbeEwNuZZtkTudJP1QbyVvh-TwFom5cE7iCi9lE,1776
 stubber/merge_config.py,sha256=NCHgpt67uR_yFaiXCtkvZIKqzold2aG7kYUzgvCg2xk,2855
-stubber/minify.py,sha256=z-acX9CNvHbir-xquD-JpAmGfZnaFHJayPJu64-Rj2M,15096
+stubber/minify.py,sha256=0uxx6FUW3KXbJ7iKUtB34Yw0QGIEfiPwcjBQ_Mw1Dns,16166
 stubber/modcat.py,sha256=tKB-8l56SuTWoIn8zEtnu5VuPf25ZIggB9x_qNYeiDI,3752
 stubber/publish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stubber/publish/bump.py,sha256=qSb1DpaIxgyoH3YcPU1XKyDKgqkomxSm0WWf1sAVh0Y,3262
@@ -74,11 +74,11 @@ stubber/publish/defaults.py,sha256=naAyHN_k8OFQfqRnXlPU3HNA0IZll-NA5GuJEvDEG_k,1
 stubber/publish/enums.py,sha256=Z_x798ArtxyjQIRRY43GDGNB9BD4uPfpeGsXYdj31w0,780
 stubber/publish/helpers.py,sha256=909umfKUHBMBoVnAanop1vKx8loCrWntlfiiG6z89lY,716
 stubber/publish/merge_docstubs.py,sha256=jlMQ3q6DqnLEJ_BvfgtXpTSlD6_XDpn697HG4fi3lRk,6513
-stubber/publish/package.py,sha256=XbPRw5aTgS53ptPmSpGlEsiIGHKWloG2-cgN2PxSaw8,5374
+stubber/publish/package.py,sha256=m1qxyCp1jqBIUVsQxpJYS0R9v4CTmYmqKp2mT7nPltk,5977
 stubber/publish/pathnames.py,sha256=vORgygaOJJAjlI3cLhNTHfowdewSDsv7zck5evPe1cY,1803
 stubber/publish/publish.py,sha256=fG95ANcdZibwWW_ZoqjhPpolswb17IOi-gTIpNPwjKc,3989
 stubber/publish/pypi.py,sha256=LdvwLfjkkSFBTI4MHyl7Ko_ZWn1SflWxJ9uo2mtPKtc,1272
-stubber/publish/stubpackage.py,sha256=-0hJhOTBfSRc3k4-pUd2LHa_t7J5HwvWHMldubeUzo4,47596
+stubber/publish/stubpackage.py,sha256=BOfHqlPNP45cKLI65VANAdO0wO1YN9F1Ks-JbEHUoKQ,47491
 stubber/rst/__init__.py,sha256=5VcbDCotIICa2xnJDs_gw2sFXpjjGOZZbwCrNKXy1OE,293
 stubber/rst/classsort.py,sha256=-Uji6LzBbX6voKmiXSuexJXyoQ3fmSDQ7Fuz4j1Kk8E,2655
 stubber/rst/lookup.py,sha256=8nnU8MZPMEUKhuZ_tbtV_eh6C7K4A1RN1wemsCodTtw,26003
@@ -103,8 +103,8 @@ stubber/utils/repos.py,sha256=kI2VcbKS1sNzFRr8mUDMdKYOYRvxpFIwy7JRyQ5Nxuk,7147
 stubber/utils/stubmaker.py,sha256=gB6n41o13WcShnSzc_lyoTFplotaPSQ3hekoLJvd2BU,5236
 stubber/utils/typed_config_toml.py,sha256=ZR7eo-whyL4nhFXj6xs7E121sLuE-ivlUDevII4K2xg,2653
 stubber/variants.py,sha256=NnwUP-aiGUPAn15BeRRFcBWQUOzAFFnN2oL4u9zio-s,3792
-micropython_stubber-1.25.0.post2.dist-info/entry_points.txt,sha256=JoR8NWh8t6pbDyn0WOMCIfRfDQAOGxqbOgJWuxv3Cxw,116
-micropython_stubber-1.25.0.post2.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
-micropython_stubber-1.25.0.post2.dist-info/METADATA,sha256=tQKV5ZLB8UM9MiiKVLgakYQjkn5CTiuVPv6TBVPEkZs,19978
-micropython_stubber-1.25.0.post2.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-micropython_stubber-1.25.0.post2.dist-info/RECORD,,
+micropython_stubber-1.25.0rc5.dist-info/entry_points.txt,sha256=JoR8NWh8t6pbDyn0WOMCIfRfDQAOGxqbOgJWuxv3Cxw,116
+micropython_stubber-1.25.0rc5.dist-info/LICENSE,sha256=Fx9qrL45ayRXgH6QzttboqZEjKXms0w1t_b_nkOqYCU,1572
+micropython_stubber-1.25.0rc5.dist-info/METADATA,sha256=HSHM20J6KSOBYrvb6778ZwSulnnLtL5y10Myam8LeTQ,19991
+micropython_stubber-1.25.0rc5.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+micropython_stubber-1.25.0rc5.dist-info/RECORD,,

stubber/codemod/visitors/type_helpers.py

@@ -47,13 +47,22 @@ def is_CONSTANT(statement):
     AnnAssign-  FOO:bool = ...
     """
 
-    if m.matches(statement, m.SimpleStatementLine()):
-        statement = statement.body[0]
-    if m.matches(statement, m.Assign()):
-        if len(statement.targets) != 1:
-            return False
-        if statement.targets[0].target.value.isupper():
-            return True
+    try:
+        if m.matches(statement, m.SimpleStatementLine()):
+            statement = statement.body[0]
+        if m.matches(statement, m.Assign()):
+            if len(statement.targets) != 1:
+                return False
+            if m.matches(statement.targets[0], m.Name()):
+                if statement.targets[0].target.value.isupper(): 
+                    return True
+            elif m.matches(statement.targets[0], m.AssignTarget()):
+                if m.matches(statement.targets[0].target, m.Name()):
+                    if statement.targets[0].children[0].value.isupper():
+                        return True
+    except Exception as e:
+        log.debug(f"Error in is_CONSTANT: {e}")
+        return False
     return False
 
 

stubber/minify.py

@@ -5,6 +5,7 @@ Minimizes and cross-compiles a MicroPyton file.
 
 import itertools
 import subprocess
+import sys
 import tempfile
 from contextlib import ExitStack
 from io import BytesIO, IOBase, StringIO, TextIOWrapper
@@ -18,6 +19,8 @@ except ImportError:
 
 from mpflash.logger import log
 from mpflash.versions import SET_PREVIEW, V_PREVIEW
+import shutil
+import os
 
 # Type Aliases for minify
 StubSource = Union[Path, str, StringIO, TextIOWrapper]
@@ -369,10 +372,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)
+    result = run_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 most current version.")
-        result = pipx_mpy_cross(V_PREVIEW, source_file, _target)
+        result = run_mpy_cross(V_PREVIEW, source_file, _target)
 
     if result.returncode == 0:
         log.debug(f"mpy-cross compiled to    : {_target.name}")
@@ -388,18 +391,36 @@ def cross_compile(
     return result.returncode
 
 
-def pipx_mpy_cross(version: str, source_file, _target):
-    """Run mpy-cross using pipx"""
-
+def locate_mpy_cross():
+    """Locate the path of the mpy-cross commandline tool in the active environment"""
+    try:
+        # Check if it's available as a command in PATH
+        mpy_cross_path = shutil.which("mpy-cross")
+        if mpy_cross_path:
+            log.info(f"Found mpy-cross executable in PATH: {mpy_cross_path}")
+            return mpy_cross_path
+        
+        # Check in the Scripts/bin directory of the current Python environment
+        bin_dir = "Scripts" if sys.platform == "win32" else "bin"
+        env_path = os.path.join(os.path.dirname(sys.executable), bin_dir, "mpy-cross")
+        if os.path.exists(env_path):
+            log.info(f"Found mpy-cross executable in Python environment: {env_path}")
+            return env_path
+        raise FileNotFoundError("mpy-cross executable not found in PATH or Python environment")
+    except Exception as e:
+        log.debug(f"Error locating mpy-cross: {e}")
+        raise FileNotFoundError("mpy-cross executable not found in PATH or Python environment") from e
+
+def run_mpy_cross(version: str, source_file, _target):
+    """Run mpy-cross using --compat if needed"""
     log.info(f"Compiling with mpy-cross version: {version}")
     if version in SET_PREVIEW:
         version = ""
     if version:
-        version = "~=" + version.lstrip("v")
+        version = version.lstrip("v")
+    compat =  ["--compat", version] if version else []
 
-    cmd = ["pipx", "run", f"mpy-cross{version}"] if version else ["pipx", "run", "mpy-cross"]
-    # Add params
-    cmd += ["-O2", str(source_file), "-o", str(_target), "-s", "createstubs.py"]
+    cmd = [locate_mpy_cross() ] + compat + ["-O2", str(source_file), "-o", str(_target), "-s", "createstubs.py"]
     log.trace(" ".join(cmd))
     result = subprocess.run(
         cmd, capture_output=True, text=True, encoding="utf-8"

stubber/publish/package.py

@@ -56,6 +56,15 @@ def get_package(
             version=version,
             json_data=package_info,
         )
+        # TODO @Josverl: Check or update stub_sources in len < 3
+        EXPECTED_STUBS = 3
+        if len(p_db.stub_sources) < EXPECTED_STUBS:
+            log.warning(f"Package {pkg_name} has less than 3 stub sources, updating...")
+            stub_sources = combo_sources(family, port, board, clean_version(p_db.mpy_version, flat=True))
+            if len(stub_sources) >= EXPECTED_STUBS:
+                p_db.stub_sources = stub_sources
+                p_db.update_sources()
+                log.info(f"Updated stub sources for {pkg_name} to {p_db.stub_sources}")
         return p_db
 
     log.debug(f"No package found for {pkg_name} in database, creating new package")
@@ -115,13 +124,13 @@ def create_package(
     create and initialize a package with the correct sources
     """
     ver_flat = clean_version(mpy_version, flat=True)
-    stubs: StubSources = []
+    stub_sources: StubSources = []
     # if pkg_type != COMBO_STUBS:
     #     raise ValueError("Not Supported")
 
     assert port != "", "port must be specified for combo stubs"
-    stubs = combo_sources(family, port, board, ver_flat)
-    return StubPackage(pkg_name, port=port, board=board, version=mpy_version, stubs=stubs)
+    stub_sources = combo_sources(family, port, board, ver_flat)
+    return StubPackage(pkg_name, port=port, board=board, version=mpy_version, stub_sources=stub_sources)
 
 
 def combo_sources(family: str, port: str, board: str, ver_flat: str) -> StubSources:

stubber/publish/stubpackage.py

@@ -210,7 +210,7 @@ class Builder(VersionedPackage):
         board: str = GENERIC_U,
         variant: Optional[str] = None,
         description: str = "MicroPython stubs",
-        stubs: Optional[StubSources] = None,
+        stub_sources: Optional[StubSources] = None,
         # json_data: Optional[Dict[str, Any]] = None,
     ):  #  port: str, board: str
         super().__init__(package_name=package_name, mpy_version=mpy_version)
@@ -221,7 +221,7 @@ class Builder(VersionedPackage):
         self.board = board
         self.variant = variant or ""
         self.description = description
-        self.stub_sources = stubs or []
+        self.stub_sources = stub_sources or []
         self.hash = None  # intial hash
         """Hash of all the files in the package"""
         self.stub_hash = None  # intial hash
@@ -323,7 +323,7 @@ class Builder(VersionedPackage):
             for n in range(len(self.stub_sources)):
                 stub_type, src_path = self.stub_sources[n]
                 try:
-                    log.debug(f"Copying {stub_type} from {src_path}")
+                    log.debug(f"Copy {stub_type:<20} from {src_path}")
                     self.copy_folder(stub_type, src_path)
                 except OSError as e:
                     if stub_type != StubSource.FROZEN:
@@ -587,7 +587,7 @@ class PoetryBuilder(Builder):
         mpy_version: str = "0.0.1",
         board: str = GENERIC_U,
         description: str = "MicroPython stubs",
-        stubs: Optional[StubSources] = None,
+        stub_sources: Optional[StubSources] = None,
         json_data: Optional[Dict[str, Any]] = None,
     ):
         super().__init__(
@@ -596,7 +596,7 @@ class PoetryBuilder(Builder):
             port=port,
             board=board,
             description=description,
-            stubs=stubs,
+            stub_sources=stub_sources,
         )
 
     # -----------------------------------------------
@@ -799,7 +799,7 @@ class StubPackage(PoetryBuilder):
         board: str = GENERIC_U,
         version: str = "0.0.1",
         description: str = "MicroPython stubs",
-        stubs: Optional[StubSources] = None,
+        stub_sources: Optional[StubSources] = None,
         json_data: Optional[Dict[str, Any]] = None,
     ):
         """
@@ -826,7 +826,7 @@ class StubPackage(PoetryBuilder):
             port=port,
             board=board,
             description=description,
-            stubs=stubs or [],
+            stub_sources=stub_sources or [],
         )
         self.port = port
         self.board = board
@@ -840,11 +840,6 @@ class StubPackage(PoetryBuilder):
 
             self.create_update_pyproject_toml()
 
-            # self.stub_sources: StubSources = []
-            # # save the stub sources
-            # if stubs:
-            #     self.stub_sources = stubs
-
         self.status: Status = Status(
             {
                 "result": "-",