generate all_wheels.zip

Author: garrettgu10

.github/workflows/build-packages.yaml

@@ -56,7 +56,7 @@ jobs:
       - name: Create GitHub Release for pyodide_bucket.bzl
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "packages/pyodide_bucket.bzl, packages/dist/pyodide-lock.json, packages/dist/pyodide_packages.tar.zip"
+          artifacts: "packages/pyodide_bucket.bzl, packages/dist/pyodide-lock.json, packages/dist/pyodide_packages.tar.zip, packages/dist/all_wheels.zip"
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ inputs.tag }}
           body: "Generated Bazel config file for release ${{ inputs.tag }}. Replace this file in workerd/build to update the Pyodide package bundle."

packages/script.py

@@ -21,10 +21,11 @@ def gen_bzl_config(tag, dist):
     bucket_url = "https://pub-45d734c4145d4285b343833ee450ef38.r2.dev/" + tag + "/"
     github_url = "https://github.com/cloudflare/pyodide-build-scripts/releases/download/" + tag + "/"
     lock_bytes = (dist / "pyodide-lock.json").read_bytes()
-    lock_contents = (dist / "pyodide-lock.json").read_text()
     lock_hash = hashlib.sha256(lock_bytes).hexdigest()
     zip_bytes = (dist / "pyodide_packages.tar.zip").read_bytes()
     zip_hash = hashlib.sha256(zip_bytes).hexdigest()
+    all_wheels_bytes = (dist / "all_wheels.zip").read_bytes()
+    all_wheels_hash = hashlib.sha256(all_wheels_bytes).hexdigest()
 
     with open("pyodide_bucket.bzl", "w") as f:
         f.write("# Do not edit this file by hand. See docs/pyodide.md for info on how to generate it.\n")
@@ -33,8 +34,8 @@ def gen_bzl_config(tag, dist):
         f.write("PYODIDE_PACKAGE_BUCKET_URL = \"" + bucket_url + "\"\n")
         f.write("PYODIDE_GITHUB_RELEASE_URL = \"" + github_url + "\"\n")
         f.write("PYODIDE_LOCK_SHA256 = \"" + lock_hash + "\"\n")
-        f.write("PYODIDE_LOCK_CONTENTS = \"\"\"" + lock_contents + "\"\"\"\n")
         f.write("PYODIDE_PACKAGES_TAR_ZIP_SHA256 = \"" + zip_hash + "\"\n")
+        f.write("PYODIDE_ALL_WHEELS_ZIP_SHA256 = \"" + all_wheels_hash + "\"\n")
 
 # creates a package bundle .tar.zip file to be bundled in with edgeworker
 # the resulting bundle is written to dist/pyodide_packages.tar.zip
@@ -61,6 +62,11 @@ def make_bundle(tag, dist = Path("dist")):
         # create zip file in dist/ from tarfile
         with zipfile.ZipFile(dist / "pyodide_packages.tar.zip", "w", compression=zipfile.ZIP_DEFLATED) as zip:
             zip.write(tempdir / "pyodide_packages.tar", "pyodide_packages.tar")
+        # create all_wheels.zip file for testing
+        with zipfile.ZipFile(dist / "all_wheels.zip", "w", compression=zipfile.ZIP_DEFLATED) as zip:
+            for package in lock["packages"].values():
+                file = dist / package["file_name"]
+                zip.write(file, f"{package['file_name']}")
 
     gen_bzl_config(tag, dist)
 
@@ -88,10 +94,10 @@ def upload_to_r2(tag, dist = Path("dist")):
     if status != 0:
         raise Exception("Failed to build recipes")
 
-    # get the current date in YYYYMMDD
-    tag = datetime.today().strftime("%Y%m%d")
-    if len(sys.argv) > 1:
-        tag = sys.argv[1]
+    if len(sys.argv) != 2:
+        print("Usage: python script.py <tag>")
+        sys.exit(1)
+    tag = sys.argv[1]
 
     make_bundle(tag)
     upload_to_r2(tag)