Update empack to 2.0.2 (#89)

Author: martinRenou

Dockerfile

@@ -5,7 +5,7 @@ ARG PYTHON_VERSION=3.10
 
 RUN micromamba install --yes -c conda-forge \
     git pip python=$PYTHON_VERSION click typer \
-    "emsdk>=3.1.11" "empack>=0.5.3"
+    "empack>=2.0.2"
 
 ##################################################################
 # Create emscripten env and pack it
@@ -22,7 +22,7 @@ RUN micromamba create -n xeus-python-kernel \
 RUN mkdir -p xeus-python-kernel && cd xeus-python-kernel && \
     cp /tmp/xeus-python-kernel/envs/xeus-python-kernel/bin/xpython_wasm.js . && \
     cp /tmp/xeus-python-kernel/envs/xeus-python-kernel/bin/xpython_wasm.wasm . && \
-    empack pack env --env-prefix /tmp/xeus-python-kernel/envs/xeus-python-kernel --outname python_data --config /opt/conda/share/empack/empack_config.yaml
+    empack pack env --env-prefix /tmp/xeus-python-kernel/envs/xeus-python-kernel --outname python_data
 
 COPY copy_output.sh .
 

environment.yml

@@ -6,6 +6,6 @@ dependencies:
   - pip
   - pytest
   - emsdk >=3.1.11
-  - empack >=0.5.3
+  - empack >=2.0.2
   - pip:
       - jupyterlite

jupyterlite_xeus_python/env_build_addon.py

@@ -80,8 +80,9 @@ class XeusPythonEnv(FederatedExtensionAddon):
     )
 
     empack_config = Unicode(
-        "https://raw.githubusercontent.com/emscripten-forge/recipes/main/empack_config.yaml",
+        None,
         config=True,
+        allow_none=True,
         description="The path or URL to the empack config file",
     )
 
@@ -134,23 +135,25 @@ def post_build(self, manager):
         # Create emscripten env with the given packages
         self.create_env()
 
+        pack_kwargs = {}
+
         # Download env filter config
-        empack_config_is_url = urlparse(self.empack_config).scheme in ("http", "https")
-        if empack_config_is_url:
-            empack_config_content = requests.get(self.empack_config).content
-            pkg_file_filter = PkgFileFilter.parse_obj(
-                yaml.safe_load(empack_config_content)
-            )
-        else:
-            pkg_file_filter = pkg_file_filter_from_yaml(self.empack_config)
+        if self.empack_config is not None:
+            empack_config_is_url = urlparse(self.empack_config).scheme in ("http", "https")
+            if empack_config_is_url:
+                empack_config_content = requests.get(self.empack_config).content
+                pack_kwargs["pkg_file_filter"] = PkgFileFilter.parse_obj(
+                    yaml.safe_load(empack_config_content)
+                )
+            else:
+                pack_kwargs["pkg_file_filter"] = pkg_file_filter_from_yaml(self.empack_config)
 
         # Pack the environment
         pack_environment(
             env_prefix=self.prefix_path,
             outname=Path(self.cwd.name) / "python_data",
             export_name="globalThis.Module",
-            pkg_file_filter=pkg_file_filter,
-            download_emsdk="latest",
+            **pack_kwargs,
         )
 
         # Find the federated extensions in the emscripten-env and install them

setup.py

@@ -57,7 +57,7 @@
         "traitlets",
         "jupyterlite",
         "requests",
-        "empack>=1.0.0,<2",
+        "empack>=2.0.2,<3",
     ],
     zip_safe=False,
     include_package_data=True,