3.13 git pgce test

Author: pmp-p

packages.d/pygame/pygame.sh

@@ -105,10 +105,8 @@ then
     # new cython (git)
     wget -O- https://patch-diff.githubusercontent.com/raw/pmp-p/pygame-ce-wasm/pull/8.diff | patch -p1
 
-    # added Vector2.from_polar and Vector3.from_spherical classmethods
-    # breaks, left a review !
-    # wget -O- https://patch-diff.githubusercontent.com/raw/pygame-community/pygame-ce/pull/2141.diff | patch -p1
-
+    # fix 3.13 build
+    wget -O- https://patch-diff.githubusercontent.com/raw/pmp-p/pygame-ce-wasm/pull/9.diff | patch -p1
 
     # cython3 / merged
     # wget -O- https://patch-diff.githubusercontent.com/raw/pygame-community/pygame-ce/pull/2395.diff | patch -p1
@@ -227,6 +225,7 @@ fi
     rm -rf build Setup
 # ===================
 
+
 if ${CI:-false}
 then
     touch $(find | grep pxd$)
@@ -239,6 +238,9 @@ then
     fi
 else
     echo "skipping cython regen"
+touch $(find | grep pxd$)
+$HPY setup.py cython_only
+
 fi
 
 #$HPY ${WORKSPACE}/src/replacer.py --go "Py_GIL_DISABLED'\): raise ImportError" "Py_GIL_DISABLED'): print(__name__)"
@@ -247,7 +249,7 @@ fi
 #SDL_IMAGE="-s USE_SDL=2 -lfreetype -lwebp"
 SDL_IMAGE="-lSDL2 -lfreetype -lwebp"
 
-export CFLAGS="-DSDL_NO_COMPAT $SDL_IMAGE"
+export CFLAGS="-DBUILD_STATIC -DSDL_NO_COMPAT $SDL_IMAGE"
 EMCC_CFLAGS="-I${SDKROOT}/emsdk/upstream/emscripten/cache/sysroot/include/freetype2"
 EMCC_CFLAGS="$EMCC_CFLAGS -I$PREFIX/include/SDL2"
 EMCC_CFLAGS="$EMCC_CFLAGS -Wno-unused-command-line-argument"
@@ -262,8 +264,8 @@ EMCC_CFLAGS="$EMCC_CFLAGS -Wno-deprecated-declarations"
 
 
 
-export EMCC_CFLAGS="$EMCC_CFLAGS -DHAVE_STDARG_PROTOTYPES -DBUILD_STATIC -ferror-limit=1 -fpic"
-
+export EMCC_CFLAGS="$EMCC_CFLAGS -DHAVE_STDARG_PROTOTYPES -ferror-limit=1 -fpic -DBUILD_STATIC"
+export COPTS="-O2 -g3 -DBUILD_STATIC"
 export CC=emcc
 
 # remove SDL1 for good
@@ -334,7 +336,7 @@ then
 
     [ -f ${TARGET_FILE} ] && rm ${TARGET_FILE} ${TARGET_FILE}.map
 
-    COPTS="-Os -g0" emcc -shared -fpic -o ${TARGET_FILE} $SDKROOT/prebuilt/emsdk/libpygame${PYMAJOR}.${PYMINOR}.a $SDL2
+    COPTS="-O2 -g3" emcc -shared -fpic -o ${TARGET_FILE} $SDKROOT/prebuilt/emsdk/libpygame${PYMAJOR}.${PYMINOR}.a $SDL2
 
     # github CI does not build wheel for now.
     echo ${WHEEL_DIR}

scripts/build-rootfs.sh

@@ -68,6 +68,11 @@ import platform
 # for pyodide runPython emulation
 from textwrap import dedent
 
+# requests/urllib3 pyodide workaround
+import http.cookiejar
+from http.cookies import Morsel
+import encodings.idna
+
 # FIXME: because _sqlite3 is builtins anyway ?
 import sqlite3
 

src/pygbag/support/cpythonrc.py

@@ -719,7 +719,8 @@ async def preload_code(cls, code, callback=None, loaderhome=".", hint=""):
 
             # auto import plumbing to avoid rely too much on import error
             maybe_wanted = list(TopLevel_async_handler.list_imports(code, file=None, hint=hint))
-            DBG(f"635: {maybe_wanted=} known failed {aio.pep0723.hint_failed=}")
+
+            DBG(f"723: {maybe_wanted=} known failed {aio.pep0723.hint_failed=} {aio.pep0723.HISTORY=}")
 
             # FIXME use an hybrid wheel
             if "pyodide" in aio.pep0723.hint_failed:
@@ -1197,6 +1198,8 @@ def scan_imports(cls, code, filename, load_try=False, hint=""):
                         mod = n.name.split(".")[0]
 
                     mod = aio.pep0723.Config.mapping.get(mod, mod)
+                    if mod in aio.pep0723.HISTORY:
+                        continue
 
                     if mod in cls.ignore:
                         continue
@@ -1249,7 +1252,7 @@ def list_imports(cls, code=None, file=None, hint=""):
             file = file or "<stdin>"
 
             for want in cls.scan_imports(code, file, hint=hint):
-                # DBG(f"1114: requesting module {want=} for {file=} ")
+                DBG(f"1265: requesting module {want=} for {file=} ")
                 repo = None
                 for repo in aio.pep0723.Config.pkg_repolist:
                     if want in cls.may_need:
@@ -1291,9 +1294,13 @@ def import_one(cls, mod, lvl=0):
 
             if mod in cls.missing_fence:
                 return []
-            from aio.pep0723 import Config
+
+            from aio.pep0723 import Config, HISTORY
 
             for dep in Config.repos[0]["packages"].get(mod, {}).get("depends", []):
+                if dep in HISTORY:
+                    continue
+
                 if dep in cls.ignore:
                     continue
 

src/pygbag/support/cross/aio/pep0723.py

@@ -56,9 +56,7 @@
 
 
 class Config:
-    #    READ_722 = False
     READ_723 = True
-    #    BLOCK_RE_722 = r"(?i)^#\s+script\s+dependencies:\s*$"
     BLOCK_RE_723 = r"(?m)^# /// (?P<type>[a-zA-Z0-9-]+)$\s(?P<content>(^#(| .*)$\s)+)^# ///$"
     PKG_BASE_DEFAULT = "https://pygame-web.github.io/archives/repo/"
     PKG_INDEXES = []
@@ -75,41 +73,16 @@ class Config:
     mapping = {
         "pygame": "pygame.base",
         "pygame_ce": "pygame.base",
+        "pygame_static": "pygame.base",
         "python_i18n": "i18n",
         "pillow": "PIL",
         "pyglm": "glm",
         "opencv_python": "cv2",
         "pysdl3": "sdl3",
     }
 
-
-def read_dependency_block_722(code):
-    # Skip lines until we reach a dependency block (OR EOF).
-    has_block = False
-    # Read dependency lines until we hit a line that doesn't
-    # start with #, or we are at EOF.
-    for line in code.split("\n"):
-        if not has_block:
-            if re.match(Config.BLOCK_RE_722, line):
-                has_block = True
-            continue
-
-        if not line.startswith("#"):
-            break
-        # Remove comments. An inline comment is introduced by
-        # a hash, which must be preceded and followed by a
-        # space.
-        line = line[1:].split(" # ", maxsplit=1)[0]
-        line = line.strip()
-        # Ignore empty lines
-        if not line:
-            continue
-        # Try to convert to a requirement. This will raise
-        # an error if the line is not a PEP 508 requirement
-        yield Requirement(line)
-
-
 def read_dependency_block_723(code):
+    global HISTORY, hint_failed
     # Skip lines until we reach a dependency block (OR EOF).
     has_block = False
 
@@ -143,7 +116,7 @@ def install(pkg_file, sconf=None):
     from installer.destinations import SchemeDictionaryDestination
     from installer.sources import WheelFile
     if pkg_file in HISTORY:
-        print(f"# 144: install: {pkg_file} already installed")
+        print(f"# 144: install: {pkg_file} already installed or skipped")
         return
 
     # Handler for installation directories and writing into them.
@@ -374,34 +347,34 @@ async def pip_install(pkg, sysconf={}):
 
 
 async def parse_code(code, env):
-    global PATCHLIST, PYGAME
+    global PATCHLIST, PYGAME, HISTORY, hint_failed
 
     maybe_missing = []
 
-    #    if Config.READ_722:
-    #        for req in read_dependency_block_722(code):
-    #            pkg = str(req)
-    #            if (env / pkg).is_dir():
-    #                print("found in env :", pkg)
-    #                continue
-    #            elif pkg not in maybe_missing:
-    #                # do not change case ( eg PIL )
-    #                maybe_missing.append(pkg.lower().replace("-", "_"))
+    import platform
 
     if Config.READ_723:
         for req in read_dependency_block_723(code):
             pkg = str(req)
             if (env / pkg).is_dir():
                 print("found in env :", pkg)
                 continue
+            elif pkg and pkg[0]=='!':
+                skip = pkg[1:]
+                if not skip in HISTORY:
+                    HISTORY.append(skip)
+                if not skip in hint_failed:
+                    hint_failed.append(skip)
+                if skip in platform.patches:
+                    if not skip in PATCHLIST:
+                        PATCHLIST.append(skip)
+                continue
             elif pkg not in maybe_missing:
                 # do not change case ( eg PIL )
                 maybe_missing.append(pkg.lower().replace("-", "_"))
 
     still_missing = []
 
-    import platform
-
     for dep in maybe_missing:
         if dep in platform.patches:
             PATCHLIST.append(dep)

src/pygbag/support/pyodide.py

@@ -10,11 +10,27 @@
 import js
 
 
+def jsa(*argv):
+    return platform.window.JSON.parse(json.dumps(argv))
+
+def jso(**kw):
+    return platform.window.JSON.parse(json.dumps(kw))
+
 class ffi:
     def create_proxy(self, fn):
         print(fn)
         return fn
 
+    def JsArray(self, *it):
+        return jsa(*it)
+    def JsException(self, *argv, **kw):
+        pass
+    def JsProxy(self, *argv, **kw):
+        pass
+
+    def to_js(self, *argv, **kw):
+        pass
+
 
 ffi = ffi()
 

src/pygbag/support/readline.py

@@ -666,8 +666,28 @@ def add_history(line: str):
     readline.history.append(line)
 
 
-def get_history_item(index: int): ...
+def get_history_item(index: int):
+    pass
+
 
 
 def get_current_history_length():
     return len(readline.history)
+
+# == TODO ==
+
+def set_completer(todo):
+    pass
+
+def parse_and_bind(todo):
+    #'tab: complete'
+    pass
+
+def read_init_file(*todo):
+    pass
+
+def read_history_file(*todo):
+    pass
+
+def write_history_file(*todo):
+    pass

support/__EMSCRIPTEN__.c

@@ -1071,7 +1071,7 @@ main(int argc, char **argv)
     setenv("HOME", "/home/web_user", 1);
     setenv("APPDATA", "/home/web_user", 1);
 
-    setenv("PYGLET_HEADLESS", "1", 1);
+    // setenv("PYGLET_HEADLESS", "1", 1);
     setenv("PSYCOPG_WAIT_FUNC", "wait_select", 1);
 
 // rich