maybe fix

Author: alexeagle

build/deps/dep_pyodide.bzl

@@ -44,38 +44,6 @@ filegroup(
 
 SNAPSHOT_R2 = "https://pyodide-capnp-bin.edgeworker.net/"
 
-def _snapshot_http_file(bundle_name, folder, snapshot, integrity, hash, r2_base = SNAPSHOT_R2):
-    if not snapshot:
-        return
-    if not integrity:
-        fail("Snapshot %s from bundle %s has missing integrity" % (snapshot, bundle_name))
-    if folder == "baseline-snapshot/":
-        key = hash
-    else:
-        key = snapshot
-    http_file(
-        name = "pyodide-snapshot-" + snapshot,
-        integrity = integrity,
-        url = r2_base + folder + key,
-    )
-
-def _snapshot_http_files(
-        name,
-        baseline_snapshot = None,
-        baseline_snapshot_hash = None,
-        baseline_snapshot_integrity = None,
-        numpy_snapshot = None,
-        numpy_snapshot_integrity = None,
-        fastapi_snapshot = None,
-        fastapi_snapshot_integrity = None,
-        dedicated_fastapi_snapshot = None,
-        dedicated_fastapi_snapshot_integrity = None,
-        **_kwds):
-    _snapshot_http_file(name, "baseline-snapshot/", baseline_snapshot, baseline_snapshot_integrity, baseline_snapshot_hash)
-    _snapshot_http_file(name, "test-snapshot/", numpy_snapshot, numpy_snapshot_integrity, None)
-    _snapshot_http_file(name, "test-snapshot/", fastapi_snapshot, fastapi_snapshot_integrity, None)
-    _snapshot_http_file(name, "", dedicated_fastapi_snapshot, dedicated_fastapi_snapshot_integrity, None, VENDOR_R2)
-
 def dep_pyodide():
     for info in PYODIDE_VERSIONS:
         _pyodide_core(**info)
@@ -87,10 +55,48 @@ def dep_pyodide():
     for info in PYTHON_LOCKFILES:
         _pyodide_packages(**info)
 
+    # Accumulator to de-duplicate generated http_file rules.
+    gen_http_file = {}
+
+    def _snapshot_http_files(
+            name,
+            baseline_snapshot = None,
+            baseline_snapshot_hash = None,
+            baseline_snapshot_integrity = None,
+            numpy_snapshot = None,
+            numpy_snapshot_integrity = None,
+            fastapi_snapshot = None,
+            fastapi_snapshot_integrity = None,
+            dedicated_fastapi_snapshot = None,
+            dedicated_fastapi_snapshot_integrity = None,
+            **_kwds):
+        def _snapshot_http_file(bundle_name, folder, snapshot, integrity, hash, r2_base = SNAPSHOT_R2):
+            if not snapshot:
+                return
+            if not integrity:
+                fail("Snapshot %s from bundle %s has missing integrity" % (snapshot, bundle_name))
+            if folder == "baseline-snapshot/":
+                key = hash
+            else:
+                key = snapshot
+            gen_http_file[snapshot] = struct(
+                integrity = integrity,
+                url = r2_base + folder + key,
+            )
+
+        _snapshot_http_file(name, "baseline-snapshot/", baseline_snapshot, baseline_snapshot_integrity, baseline_snapshot_hash)
+        _snapshot_http_file(name, "test-snapshot/", numpy_snapshot, numpy_snapshot_integrity, None)
+        _snapshot_http_file(name, "test-snapshot/", fastapi_snapshot, fastapi_snapshot_integrity, None)
+        _snapshot_http_file(name, "", dedicated_fastapi_snapshot, dedicated_fastapi_snapshot_integrity, None, VENDOR_R2)
+
     for ver in BUNDLE_VERSION_INFO.values():
-        if ver["name"] == "development" or ver["name"] == "0.26.0a2":
-            continue  # development is a copy of earlier bundle snapshots
         _snapshot_http_files(**ver)
+    for snapshot, info in gen_http_file.items():
+        http_file(
+            name = "pyodide-snapshot-" + snapshot,
+            integrity = info.integrity,
+            url = info.url,
+        )
 
 def _impl(module_ctx):
     dep_pyodide()

build/deps/python.MODULE.bazel

@@ -20,14 +20,26 @@ pip.parse(
 use_repo(pip, "py_deps", "v8_python_deps")
 
 pyodide = use_extension("//build/deps:dep_pyodide.bzl", "pyodide")
+
+[
+    use_repo(
+        pyodide,
+        "{}_src_{}".format(library, version),
+    )
+    for version in [
+        "0.26.0a2",
+        "0.28.2",
+        "development",
+    ]
+    for library in [
+        "beautifulsoup4",
+        "fastapi",
+        "python-workers-runtime-sdk",
+    ]
+]
+
 use_repo(
     pyodide,
-    "beautifulsoup4_src_0.26.0a2",
-    "beautifulsoup4_src_0.28.2",
-    "beautifulsoup4_src_development",
-    "fastapi_src_0.26.0a2",
-    "fastapi_src_0.28.2",
-    "fastapi_src_development",
     "pyodide-0.26.0a2",
     "pyodide-0.28.2",
     "pyodide-lock_20240829.4.json",
@@ -38,10 +50,14 @@ use_repo(
     # "pyodide-snapshot-ew-py-package-snapshot_numpy-v2.bin",
     "pyodide-snapshot-package_snapshot_fastapi-a6ccb56fe.bin",
     "pyodide-snapshot-package_snapshot_numpy-60c9cb28e.bin",
-    "python-workers-runtime-sdk_src_0.26.0a2",
-    "python-workers-runtime-sdk_src_0.28.2",
-    "python-workers-runtime-sdk_src_development",
     # "scipy_src_0.26.0a2",
     # "scipy_src_0.28.2",
     # "scipy_src_development",
+    "all_pyodide_wheels_20240829.4",
+    "all_pyodide_wheels_20250808",
+    "pyodide-snapshot-baseline-61eedf943.bin",
+    "pyodide-snapshot-ew-py-package-snapshot_fastapi-v2.bin",
+    "pyodide-snapshot-ew-py-package-snapshot_numpy-v2.bin",
+    "pyodide-snapshot-snapshot_a6b652a95810783f5078b9a5dbd4a07c30718acb4ff724e82c25db7353dd7f2d.bin",
+    "shapely_src_0.28.2",
 )