freedos-micro-python 0.1.0__tar.gz → 0.1.2__tar.gz

{freedos_micro_python-0.1.0/src/freedos_micro_python.egg-info → freedos_micro_python-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freedos_micro_python
-Version: 0.1.0
+Version: 0.1.2
 Summary: MicroPython port for FreeDOS / i386 — built end-to-end through the uc386 C23 compiler
 Author: freedos_micro_python contributors
 License-Expression: MIT
@@ -21,7 +21,7 @@ Classifier: Topic :: System :: Emulators
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: uc386>=0.1.0
+Requires-Dist: uc386>=0.1.1
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Dynamic: license-file

{freedos_micro_python-0.1.0 → freedos_micro_python-0.1.2}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "freedos_micro_python"
-version = "0.1.0"
+version = "0.1.2"
 description = "MicroPython port for FreeDOS / i386 — built end-to-end through the uc386 C23 compiler"
 readme = "README.md"
 license = "MIT"
 requires-python = ">=3.10"
 dependencies = [
-    "uc386>=0.1.0",
+    "uc386>=0.1.1",
 ]
 authors = [
     {name = "freedos_micro_python contributors"}

{freedos_micro_python-0.1.0 → freedos_micro_python-0.1.2}/src/freedos_micro_python/cli.py

@@ -65,6 +65,14 @@ def _run_script(name: str, workdir: Path, extra_args: list[str]) -> int:
     env["UC386_LIB_INCLUDE"] = str(_uc386_lib_include())
     env["FREEDOS_MP_PORT_DIR"] = str(_port_dir())
     env["FREEDOS_MP_SCRIPTS_DIR"] = str(_scripts_dir())
+    env["FREEDOS_MP_GEN_QSTRDEFS"] = str(
+        _scripts_dir().parent / "gen_qstrdefs.py"
+    )
+    # Pin the python the scripts invoke for `python -m uc386.main` to
+    # the same interpreter that's running this CLI — it's the one with
+    # uc386 installed. Without this the scripts fall back to
+    # `command -v python3.12` and hit the system python without uc386.
+    env["PYTHON"] = sys.executable
     workdir.mkdir(parents=True, exist_ok=True)
     _ensure_port_symlink(workdir)
     return subprocess.run(

{freedos_micro_python-0.1.0 → freedos_micro_python-0.1.2}/src/freedos_micro_python/scripts/build.sh

@@ -219,7 +219,7 @@ if [ ! -f build/genhdr/qstrdefs.generated.h ]; then
             grep -hoE "^[[:space:]]*X\([A-Z][A-Z0-9_]*\)" \
                     upstream/py/moderrno.c \
                 | sed -E 's/^[[:space:]]*X\(([A-Z][A-Z0-9_]*)\)/MP_QSTR_\1/'
-        } | "$PYTHON" gen_qstrdefs.py --bytes-hash 2
+        } | "$PYTHON" "${FREEDOS_MP_GEN_QSTRDEFS:-$(dirname "$0")/../gen_qstrdefs.py}" --bytes-hash 2
     } > build/genhdr/qstrdefs.generated.h
 fi
 # Always regenerate moduledefs.h — it's small and the cache turned

{freedos_micro_python-0.1.0 → freedos_micro_python-0.1.2}/src/freedos_micro_python/scripts/build_port.sh

@@ -63,8 +63,16 @@ fi
 # moduledefs.h, mpversion.h, root_pointers.h) that py/*.c expects.
 # Run it first if those aren't here yet.
 if [ ! -f build/genhdr/qstrdefs.generated.h ]; then
-    echo "micropython: stub headers missing; running ./build.sh first." >&2
-    ./build.sh > /dev/null
+    # Look for build.sh next to ourselves first (CLI sets
+    # FREEDOS_MP_SCRIPTS_DIR; standalone caller likely has it as
+    # a sibling of build_port.sh).
+    BUILD_SH="${FREEDOS_MP_SCRIPTS_DIR:-$(dirname "$0")}/build.sh"
+    if [ ! -x "$BUILD_SH" ]; then
+        echo "micropython: cannot find build.sh; tried $BUILD_SH" >&2
+        exit 1
+    fi
+    echo "micropython: stub headers missing; running build.sh first." >&2
+    "$BUILD_SH" > /dev/null
 fi
 
 # Two ways this script gets its uc386 paths:

{freedos_micro_python-0.1.0 → freedos_micro_python-0.1.2/src/freedos_micro_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freedos_micro_python
-Version: 0.1.0
+Version: 0.1.2
 Summary: MicroPython port for FreeDOS / i386 — built end-to-end through the uc386 C23 compiler
 Author: freedos_micro_python contributors
 License-Expression: MIT
@@ -21,7 +21,7 @@ Classifier: Topic :: System :: Emulators
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: uc386>=0.1.0
+Requires-Dist: uc386>=0.1.1
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Dynamic: license-file

{freedos_micro_python-0.1.0 → freedos_micro_python-0.1.2}/src/freedos_micro_python.egg-info/requires.txt

@@ -1,4 +1,4 @@
-uc386>=0.1.0
+uc386>=0.1.1
 
 [dev]
 pytest>=7.0