@ai-ecoverse/wasix-python 3.14.2-16 → 3.14.2-19

package/lib/libpython3.14.a

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/lib/libpython3.14.a
-size: 59362746 bytes
-sha256: b5320f13b4636974f7dcf92f662e9e9f488a051d092d7bff059ad787522bb0b1
+size: 59362794 bytes
+sha256: 4e66bda99fd67aa10c3914635ddbbd4d0a51d71c4cfe2da72851be8d7849a53b

package/lib/python3.14/_slicc_site.py

@@ -24,9 +24,17 @@ resolves to (Node-style lookup from its real directory), if any, has the
 same exact version as this python: the same version is the same build, so
 native side modules never mix interpreter builds. The first package of a
 name wins; others are skipped (reported under -v).
-The result is cached in <python>/.slicc-site-cache, keyed on the package
-directories and their package.json stamps, plus the stamps of the
-wasix-python copies they resolved to; -v always rescans.
+The result is cached per user in ${XDG_CACHE_HOME:-~/.cache}/slicc-site/
+(3.14.2-17; before, <python>/.slicc-site-cache, which other users could not
+write), keyed on the package directories and their package.json stamps, plus
+the stamps of the wasix-python copies they resolved to; -v always rescans.
+Without a home or a writable cache directory there is no cache.
+
+system_site() (3.14.2-17): /usr/local/lib/python3.X/site-packages, when it
+exists, goes on sys.path through site.addsitedir (so its .pth files run),
+after python's own site-packages and the py-* directories: one place an
+embedder can put a .pth for every user. Like discover(), it runs from the
+base .pth only, so a venv sees it with --system-site-packages.
 """
 import os
 import sys
@@ -212,8 +220,8 @@ def discover():
     # slicc's OPFS; directory mtimes are not). A hit costs one stat per
     # package instead of realpath + read + parse + lookup.
     key = "\n".join(filter(None, [base, _stamp(real), *map(_stamp, found)]))
-    cache = os.path.join(real, ".slicc-site-cache")
-    if not sys.flags.verbose:
+    cache = _cache_path(real)
+    if cache and not sys.flags.verbose:
         try:
             with open(cache, encoding="utf-8") as f:
                 head, _, rest = f.read().partition("\n\n")
@@ -231,15 +239,37 @@ def discover():
     for d in dirs:
         if d not in sys.path:  # as PYTHONPATH would: .pth files there are not run
             sys.path.append(d)
+    if not cache:
+        return
     try:
+        os.makedirs(os.path.dirname(cache), exist_ok=True)
         tmp = f"{cache}.{os.getpid()}"
         with open(tmp, "w", encoding="utf-8") as f:
             f.write(key + "\n\n" + "\n".join(filter(None, map(_stamp, sorted(used)))) + "\n\n" + "\n".join(dirs))
         os.replace(tmp, cache)
-    except OSError:  # read-only install: no cache, scan every start
+    except OSError:  # no writable cache directory: scan every start
         pass
 
 
+def _cache_path(real):
+    base = os.environ.get("XDG_CACHE_HOME")
+    if not base:
+        home = os.environ.get("HOME")
+        if not home:
+            return None
+        base = os.path.join(home, ".cache")
+    return os.path.join(base, "slicc-site", real.strip("/").replace("/", "%") or "%")
+
+
+def system_site():
+    d = f"/usr/local/lib/python{sys.version_info[0]}.{sys.version_info[1]}/site-packages"
+    if d in sys.path or not os.path.isdir(d):
+        return
+    import site
+
+    site.addsitedir(d)
+
+
 def _scan(real, found):
     me = _manifest(real)
     if not me or me.get("name") != _PY_PKG:

package/lib/python3.14/ensurepip/__init__.py

@@ -169,7 +169,13 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
         if verbosity:
             args += ["-" + "v" * verbosity]
 
-        return _run_pip([*args, "pip"], [os.fsdecode(tmp_wheel_path)])
+        pip_path = [os.fsdecode(tmp_wheel_path)]
+        installed = sysconfig.get_path("purelib", vars={"base": sys.base_prefix, "platbase": sys.base_prefix})
+        if (sys.platform == "wasi" and sys.prefix != sys.base_prefix and not root and not user
+                and os.path.isdir(os.path.join(installed, f"pip-{_PIP_VERSION}.dist-info"))):
+            pip_path = [installed]
+            args += ["--ignore-installed"]
+        return _run_pip([*args, "pip"], pip_path)
 
 
 def _uninstall_helper(*, verbosity=0):

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

@@ -1 +1 @@
-import _slicc_site; _slicc_site.fix(); _slicc_site.discover()
+import _slicc_site; _slicc_site.fix(); _slicc_site.discover(); _slicc_site.system_site()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/wasix-python",
-  "version": "3.14.2-16",
+  "version": "3.14.2-19",
   "description": "CPython 3.14 for slicc WASIX (commands python, python3; cross-built in CI on wasix-sysroot)",
   "license": "PSF-2.0 AND GPL-3.0-or-later",
   "engines": {
@@ -55,6 +55,32 @@
           "PYTHONHOME": "./",
           "PYTHONDONTWRITEBYTECODE": "1"
         }
+      },
+      "pip": {
+        "wasm": "bin/python.wasm",
+        "argv0Path": true,
+        "env": {
+          "PYTHONHOME": "./",
+          "PYTHONDONTWRITEBYTECODE": "1"
+        },
+        "argv0": "python3",
+        "args": [
+          "-m",
+          "pip"
+        ]
+      },
+      "pip3": {
+        "wasm": "bin/python.wasm",
+        "argv0Path": true,
+        "env": {
+          "PYTHONHOME": "./",
+          "PYTHONDONTWRITEBYTECODE": "1"
+        },
+        "argv0": "python3",
+        "args": [
+          "-m",
+          "pip"
+        ]
       }
     },
     "python": {