backport changes from mpy-cross-v6.3 v1.1.0

Author: dlech

.github/workflows/publish.yml

@@ -30,7 +30,7 @@ jobs:
           platforms: all
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v3.1.3
         env:
           CIBW_ARCHS_MACOS: x86_64 arm64
           CIBW_ARCHS_LINUX: x86_64 aarch64
@@ -69,7 +69,7 @@ jobs:
           merge-multiple: true
           path: dist
 
-      - uses: pypa/[email protected].3
+      - uses: pypa/[email protected].4
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN4 }}

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
     "[python]": {
-        "editor.defaultFormatter": "ms-python.python",
+        "editor.defaultFormatter": "ms-python.black-formatter",
         "editor.formatOnSave": true
-    },
-    "python.formatting.provider": "black"
+    }
 }

MANIFEST.in

@@ -1,5 +1,6 @@
 recursive-include micropython py/** mpy-cross/** shared/** tools/**
 include micropython/docs/conf.py
+include micropython/extmod/modplatform.h
 prune micropython/mpy-cross/build*
 prune micropython/ports*
 exclude src/mpy_cross_v6.2/mpy-cross*

README.md

@@ -6,18 +6,25 @@ from [MicroPython](https://github.com/micropython/micropython) via PyPI.
 There are multiple MPY ABI versions, so you will need to install the package
 that corresponds to the target MicroPython version.
 
-For MicroPython 1.12 to 1.18:
+Alternatively, you can install the [mpy-cross-multi](https://pypi.org/project/mpy-cross-multi/)
+package to install all versions of `mpy-cross` at once.
 
-    pip install mpy-cross-v5
+For MicroPython 1.23 and up:
 
-For MicroPython 1.19:
+    pip install mpy-cross-v6.3
 
-    pip install mpy-cross-v6
+For MicroPython 1.22:
+
+    pip install mpy-cross-v6.2
 
 For MicroPython 1.20 to 1.21:
 
     pip install mpy-cross-v6.1
 
-For MicroPython 1.22:
+For MicroPython 1.19:
 
-    pip install mpy-cross-v6.2
+    pip install mpy-cross-v6
+
+For MicroPython 1.12 to 1.18:
+
+    pip install mpy-cross-v5

pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mpy-cross-v6.2"
-version = "1.0.0"
+version = "1.1.0"
 description = "Python wrapper for the mpy-cross tool from MicroPython."
 readme = "README.md"
 
 [project.scripts]
-"mpy-cross-v6.2" = "mpy_cross_v6_2:_run"
+"mpy-cross-v6.2" = "mpy_cross_v6_2:run"
 
 [tool.setuptools.packages.find]
 where = ["src"]

src/mpy_cross_v6_2/__init__.py

@@ -1,13 +1,12 @@
 from enum import Enum
 import subprocess
 import sys
-import tempfile
 import pathlib
 import platform
 from typing import List, Optional, Tuple
 
 
-MPY_CROSS_PATH = (
+MPY_CROSS_PATH = str(
     (pathlib.Path(__file__).parent / "mpy-cross")
     .with_suffix(".exe" if platform.system() == "Windows" else "")
     .absolute()
@@ -42,7 +41,7 @@ def mpy_cross_compile(
     emit: Optional[Emitter] = None,
     heap_size: Optional[int] = None,
     extra_args: Optional[List[str]] = None,
-) -> Tuple[subprocess.CompletedProcess, Optional[bytes]]:
+) -> Tuple[subprocess.CompletedProcess[bytes], Optional[bytes]]:
     """
     Compiles a file using mpy-cross.
 
@@ -75,44 +74,32 @@ def mpy_cross_compile(
         ...
 
     """
-    with tempfile.TemporaryDirectory() as tmp_dir:
-        tmp_dir = pathlib.Path(tmp_dir)
+    args: list[str] = [MPY_CROSS_PATH, "-", "-s", file_name]
 
-        with open(tmp_dir / "tmp.py", "w") as in_file:
-            in_file.write(file_contents)
+    if optimization_level is not None:
+        if optimization_level not in range(4):
+            raise ValueError("optimization_level must be between 0 and 3")
 
-        args = [MPY_CROSS_PATH, in_file.name, "-s", file_name]
+        args.append(f"-O{optimization_level}")
 
-        if optimization_level is not None:
-            if optimization_level not in range(4):
-                raise ValueError("optimization_level must be between 0 and 3")
+    if small_number_bits is not None:
+        args.append(f"-msmall-int-bits={small_number_bits}")
 
-            args.append(f"-O{optimization_level}")
+    if arch is not None:
+        args.append(f"-march={arch.value}")
 
-        if small_number_bits is not None:
-            args.append(f"-msmall-int-bits={small_number_bits}")
+    if emit is not None:
+        args += ["-X", f"emit={emit.value}"]
 
-        if arch is not None:
-            args.append(f"-march={arch.value}")
+    if heap_size is not None:
+        args += ["-X", f"heapsize={heap_size}"]
 
-        if emit is not None:
-            args += ["-X", f"emit={emit.value}"]
+    if extra_args:
+        args += extra_args
 
-        if heap_size is not None:
-            args += ["-X", f"heapsize={heap_size}"]
+    process = subprocess.run(args, capture_output=True, input=file_contents.encode())
 
-        if extra_args:
-            args += extra_args
-
-        process = subprocess.run(args, capture_output=True)
-
-        try:
-            with open(tmp_dir / "tmp.mpy", "rb") as out_file:
-                data = out_file.read()
-        except OSError:
-            data = None
-
-        return process, data
+    return process, process.stdout if process.returncode == 0 else None
 
 
 def mpy_cross_version() -> str:
@@ -124,7 +111,7 @@ def mpy_cross_version() -> str:
     return proc.stdout.decode().strip()
 
 
-def _run():
+def run() -> None:
     """
     Run mpy-cross directly.
     """

src/mpy_cross_v6_2/__main__.py

@@ -1,4 +1,4 @@
-from . import _run
+from . import run
 
 if __name__ == "__main__":
-    _run()
+    run()

src/mpy_cross_v6_2/py.typed

@@ -6,6 +6,7 @@
 def test_compile_no_opts():
     p, mpy = mpy_cross_compile("test.py", "")
     p.check_returncode()
+    assert mpy is not None
 
     magic, version, flags, small_int_bits = struct.unpack_from("BBBB", mpy)
 
@@ -18,6 +19,7 @@ def test_compile_no_opts():
 def test_compile_opt_small_int_bits():
     p, mpy = mpy_cross_compile("test.py", "", small_number_bits=63)
     p.check_returncode()
+    assert mpy is not None
 
     magic, version, flags, small_int_bits = struct.unpack_from("BBBB", mpy)