Move mpdec and libffi into a dependencies subtable

Author: hoodmane

.github/workflows/reusable-emscripten.yml

@@ -27,8 +27,7 @@ jobs:
 
         config = tomllib.loads(Path("Platforms/emscripten/config.toml").read_text())
         h = hashlib.sha256()
-        h.update(json.dumps(config["libffi"], sort_keys=True).encode())
-        h.update(json.dumps(config["mpdec"], sort_keys=True).encode())
+        h.update(json.dumps(config["dependencies"], sort_keys=True).encode())
         h.update(Path("Platforms/emscripten/make_libffi.sh").read_bytes())
         emsdk_cache = Path(os.environ["RUNNER_TEMP"]) / "emsdk-cache"
         with open(os.environ["GITHUB_OUTPUT"], "a") as f:

Platforms/emscripten/__main__.py

@@ -350,7 +350,7 @@ def write_library_config(prefix, name, config, quiet):
 def make_emscripten_libffi(context, working_dir):
     validate_emsdk_version(context.emsdk_cache)
     prefix = context.build_paths["prefix_dir"]
-    libffi_config = load_config_toml()["libffi"]
+    libffi_config = load_config_toml()["dependencies"]["libffi"]
     if not should_build_library(
         prefix, "libffi", libffi_config, context.quiet
     ):
@@ -378,7 +378,7 @@ def make_emscripten_libffi(context, working_dir):
 def make_mpdec(context, working_dir):
     validate_emsdk_version(context.emsdk_cache)
     prefix = context.build_paths["prefix_dir"]
-    mpdec_config = load_config_toml()["mpdec"]
+    mpdec_config = load_config_toml()["dependencies"]["mpdec"]
     if not should_build_library(prefix, "mpdec", mpdec_config, context.quiet):
         return
 
@@ -705,15 +705,15 @@ def main():
         help=(
             "If passed, will add the default test arguments to the beginning of the command. "
             "Default arguments loaded from Platforms/emscripten/config.toml"
-        )
+        ),
     )
     run.add_argument(
         "args",
         nargs=argparse.REMAINDER,
         help=(
             "Arguments to pass to the emscripten Python "
             "(use '--' to separate from run options)",
-        )
+        ),
     )
     add_cross_build_dir_option(run)
 

Platforms/emscripten/config.toml

@@ -12,12 +12,12 @@ test-args = [
     "-W",
 ]
 
-[libffi]
+[dependencies.libffi]
 url = "https://github.com/libffi/libffi/releases/download/v{version}/libffi-{version}.tar.gz"
 version = "3.4.6"
 shasum = "b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e"
 
-[mpdec]
+[dependencies.mpdec]
 url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-{version}.tar.gz"
 version = "4.0.1"
 shasum = "96d33abb4bb0070c7be0fed4246cd38416188325f820468214471938545b1ac8"