@ai-ecoverse/wasix-python 3.14.2-10 → 3.14.2-11

package/README.md

@@ -28,27 +28,33 @@ PYTHONPATH=<dir>/lib/python3.14/site-packages python -c "import six"
 
 On plain Wasmer without `_ssl`, use a local wheel (`--no-index --find-links`) until openssl/`_ssl` is enabled.
 
-## Virtual environments (3.14.2-10)
+## Virtual environments (slicc-kernel ≥ 1.29.0)
 
 ```text
 python -m venv v && v/bin/pip install requests && v/bin/python -c "import requests"
 ```
 
-`lib/python3.14/sitecustomize.py` sets `sys.executable` from PATH (WASI
-`stat()` has no permission bits, so CPython cannot find itself), so
-`python -m venv` works. A `sitecustomize` of your own still runs.
+**Venvs need slicc-kernel ≥ 1.29.0** (`engines` says so). On older kernels a
+venv's `bin/python` and `bin/pip` run as the base interpreter: `v/bin/pip
+install` then installs into the **base** package directory, not the venv.
 
-Whether a venv's own python sees the venv depends on the kernel:
+CPython cannot find its own executable here (WASI `stat()` has no permission
+bits, so its PATH search never matches), so `_slicc_site.py` sets
+`sys.executable` from PATH. Two hooks run it:
+`site-packages/slicc-executable.pth` for the base interpreter (a
+`sitecustomize` of yours on `PYTHONPATH` cannot switch it off) and the stdlib
+`sitecustomize.py` for venvs without system site-packages. A `sitecustomize`
+of your own still runs after ours, and `import sitecustomize` returns yours.
 
-| | slicc-kernel < 1.29.0 | slicc-kernel ≥ 1.29.0 (#168) |
+`python` and `python3` set `"argv0Path": true`, so slicc-kernel ≥ 1.29.0
+(#168) passes a venv's `bin/python` path as `argv[0]`; that is how CPython
+finds the venv's `pyvenv.cfg`:
+
+| | slicc-kernel < 1.29.0 | slicc-kernel ≥ 1.29.0 |
 | --- | --- | --- |
-| `v/bin/python`, `v/bin/pip`, venv console scripts | run as the **base** interpreter (they install into, and import from, the base) | run **in the venv** |
-| `source v/bin/activate; python …` | base interpreter (`python` on PATH is a link to the command) | in the venv |
+| `v/bin/python`, `v/bin/pip`, venv console scripts | run as the **base** interpreter (install into, and import from, the base) | run **in the venv** |
+| `source v/bin/activate; python …` | base interpreter | in the venv |
 | `uv run …` ([`@ai-ecoverse/wasix-uv-shim`](https://www.npmjs.com/package/@ai-ecoverse/wasix-uv-shim)) | in the venv | in the venv |
 
-`python` and `python3` set `"argv0Path": true`, so a kernel with
-slicc-kernel#168 passes a venv's `bin/python` path as `argv[0]`; that is
-how CPython finds the venv's `pyvenv.cfg`. Until then,
-use `uv run` or set `PYTHONEXECUTABLE=$PWD/v/bin/python`.
-
-3.14.2-10 is 3.14.2-9's files plus `sitecustomize.py`.
+3.14.2-11 is 3.14.2-9's files plus `sitecustomize.py`, `_slicc_site.py` and
+`site-packages/slicc-executable.pth`.

package/lib/python3.14/_slicc_site.py

@@ -0,0 +1,27 @@
+"""slicc (homescoop wasix-python): give the interpreter a sys.executable.
+
+WASI stat() has no permission bits, so CPython's PATH search for argv[0]
+(getpath's isxfile) never matches the kernel's /usr/bin commands and
+sys.executable stays '' (python -m venv then refuses to run). fix() fills
+it in from PATH. It runs twice per start, idempotently: from
+site-packages/slicc-executable.pth (base interpreter; a sitecustomize on
+PYTHONPATH cannot shadow it) and from the stdlib sitecustomize.py (venvs
+without system site-packages, which skip the base .pth files). A venv's own
+bin/python gets its path from argv[0] on slicc-kernel >= 1.29.0.
+"""
+import os
+import sys
+
+
+def fix():
+    if sys.executable:
+        return
+    argv0 = sys.orig_argv[0] if sys.orig_argv else ""
+    name = os.path.basename(argv0) or "python3"
+    for d in os.environ.get("PATH", "/usr/bin:/bin").split(os.pathsep):
+        p = os.path.abspath(os.path.join(d or ".", name))
+        if os.path.isfile(p):
+            sys.executable = p
+            if not getattr(sys, "_base_executable", ""):
+                sys._base_executable = p
+            return

package/lib/python3.14/site-packages/slicc-executable.pth

@@ -0,0 +1 @@
+import _slicc_site; _slicc_site.fix()

package/lib/python3.14/sitecustomize.py

@@ -1,28 +1,13 @@
-# slicc (homescoop wasix-python): fill in sys.executable when getpath could
-# not. WASI stat() has no permission bits, so CPython's PATH search for
-# argv[0] (isxfile) never matches the kernel's /usr/bin commands and
-# sys.executable stays '' (python -m venv then refuses to run). A venv's
-# python is found from argv[0] once slicc-kernel passes the invoked path
-# (slicc-kernel#168); this only covers the base interpreter.
-#
-# Shipped in the stdlib directory, so it shadows a sitecustomize further
-# down sys.path; that one is still run, after this.
+# slicc (homescoop wasix-python): sys.executable for the interpreter, see
+# _slicc_site.py. Shipped in the stdlib directory, so it shadows a
+# sitecustomize further down sys.path; that one still runs, after this, and
+# is what `import sitecustomize` then returns.
 import os
 import sys
 
+import _slicc_site
 
-def _slicc_executable():
-    if sys.executable:
-        return
-    argv0 = sys.orig_argv[0] if sys.orig_argv else ""
-    name = os.path.basename(argv0) or "python3"
-    for d in os.environ.get("PATH", "/usr/bin:/bin").split(os.pathsep):
-        p = os.path.join(d or ".", name)
-        if os.path.isfile(p):
-            sys.executable = p
-            if not getattr(sys, "_base_executable", ""):
-                sys._base_executable = p
-            return
+_slicc_site.fix()
 
 
 def _slicc_chain():
@@ -35,12 +20,18 @@ def _slicc_chain():
     if spec is None or spec.origin == os.path.abspath(__file__):
         return
     module = importlib.util.module_from_spec(spec)
-    spec.loader.exec_module(module)
+    ours = sys.modules.get("sitecustomize")
+    sys.modules["sitecustomize"] = module
+    try:
+        spec.loader.exec_module(module)
+    except BaseException:
+        if ours is not None:
+            sys.modules["sitecustomize"] = ours
+        raise
 
 
-_slicc_executable()
 try:
     _slicc_chain()
 except Exception as exc:  # as site.py does for a failing sitecustomize
     print(f"Error in sitecustomize; set PYTHONVERBOSE for traceback:\n{type(exc).__name__}: {exc}", file=sys.stderr)
-del _slicc_executable, _slicc_chain
+del _slicc_chain

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@ai-ecoverse/wasix-python",
-  "version": "3.14.2-10",
-  "description": "CPython 3.14 for slicc WASIX (sys.executable set for venvs; packaging-only over 3.14.2-9)",
+  "version": "3.14.2-11",
+  "description": "CPython 3.14 for slicc WASIX (venvs on slicc-kernel >= 1.29.0; packaging-only over 3.14.2-9)",
   "license": "PSF-2.0",
+  "engines": {
+    "slicc-kernel": ">=1.29.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ai-ecoverse/homescoop.git",