fix naming

Author: alexeagle

MODULE.bazel

@@ -37,8 +37,30 @@ git_override(
 # downstream build.
 bazel_dep(name = "boringssl", version = "0.20250818.0", repo_name = "ssl")
 
+pyodide = use_extension("//build/deps:dep_pyodide.bzl", "dep_pyodide")
+use_repo(
+    pyodide,
+    "all_pyodide_wheels_20240829.4",
+    "all_pyodide_wheels_20250808",
+    "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",
+    "pyodide-lock_20250808.json",
+    "pyodide-snapshot-baseline-32a2de5f7.bin",
+    "pyodide-snapshot-baseline-d13ce2f4a.bin",
+    "pyodide-snapshot-ew-py-package-snapshot_fastapi-v2.bin",
+    "pyodide-snapshot-ew-py-package-snapshot_numpy-v2.bin",
+    "pyodide-snapshot-package_snapshot_fastapi-a6ccb56fe.bin",
+    "pyodide-snapshot-package_snapshot_numpy-60c9cb28e.bin",
+)
+
 include("//build/deps:deps.MODULE.bazel")
 include("//build/deps:nodejs.MODULE.bazel")
 include("//build/deps:python.MODULE.bazel")
-include("//build/deps:pyodide.MODULE.bazel")
 include("//build/deps:v8.MODULE.bazel")

build/deps/pyoxide.MODULE.bazel build/deps/dep_pyodide.bzlbuild/deps/pyoxide.MODULE.bazel renamed to build/deps/dep_pyodide.bzl

@@ -1,6 +1,5 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 load("//:build/python_metadata.bzl", "BUNDLE_VERSION_INFO", "PYODIDE_VERSIONS", "PYTHON_LOCKFILES")
-http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 
 def _pyodide_core(*, version, sha256, **_kwds):
     # Use @workerd prefix on build_file so we can use this from edgeworker too
@@ -74,16 +73,19 @@ def _snapshot_http_files(
     _snapshot_http_file(name, "test-snapshot/", numpy_snapshot, numpy_snapshot_integrity, None)
     _snapshot_http_file(name, "test-snapshot/", fastapi_snapshot, fastapi_snapshot_integrity, None)
 
+def _impl(mctx):
+    for info in PYODIDE_VERSIONS:
+        _pyodide_core(**info)
 
-for info in PYODIDE_VERSIONS:
-    _pyodide_core(**info)
+    for info in BUNDLE_VERSION_INFO.values():
+        for pkg in info["vendored_packages_for_tests"].values():
+            _py_vendor_test_deps(version = info["name"], **pkg)
 
-for info in BUNDLE_VERSION_INFO.values():
-    for pkg in info["vendored_packages_for_tests"].values():
-        _py_vendor_test_deps(version = info["name"], **pkg)
+    for info in PYTHON_LOCKFILES:
+        _pyodide_packages(**info)
+    for ver in BUNDLE_VERSION_INFO.values():
+        if ver["name"] == "development":
+            continue  # development is a copy of earlier bundle snapshots
+        _snapshot_http_files(**ver)
 
-for info in PYTHON_LOCKFILES:
-    _pyodide_packages(**info)
-
-for ver in BUNDLE_VERSION_INFO.values():
-    _snapshot_http_files(**ver)
+dep_pyodide = module_extension(implementation = _impl)

src/workerd/server/tests/python/import_tests.bzl

@@ -44,7 +44,7 @@ def _test(name, directory, wd_test, py_file, python_version, **kwds):
         src = wd_test,
         python_flags = [python_version],
         make_snapshot = False,
-        args = ["--experimental", "--pyodide-package-disk-cache-dir", "../all_pyodide_wheels_%s" % pkg_tag],
+        args = ["--experimental", "--pyodide-package-disk-cache-dir", "external/all_pyodide_wheels_%s" % pkg_tag],
         skip_default_data = True,
         data = [py_file, "@all_pyodide_wheels_%s//:whls" % pkg_tag],
         **kwds