Merge pull request #16 from martinRenou/update_empack_emsdk

Update emsdk and empack

Author: martinRenou

.github/workflows/build.yml

@@ -131,10 +131,7 @@ jobs:
           python -c "from mamba.api import create"
 
       - name: Install
-        run: |
-          emsdk install 3.1.2
-          emsdk activate 3.1.2
-          pip install jupyterlite-xeus-python.tar.gz
+        run: pip install jupyterlite-xeus-python.tar.gz
 
       - name: Run tests
         run: pytest -rP tests/test_xeus_python_env.py
@@ -160,10 +157,7 @@ jobs:
           mamba-version: "*"
 
       - name: Install
-        run: |
-          emsdk install 3.1.2
-          emsdk activate 3.1.2
-          pip install jupyterlite-xeus-python.tar.gz
+        run: pip install jupyterlite-xeus-python.tar.gz
 
       - name: Run tests
         run: pytest -rP tests/test_xeus_python_env.py
@@ -188,10 +182,7 @@ jobs:
           environment-name: xeus-python-kernel
 
       - name: Install
-        run: |
-          emsdk install 3.1.2
-          emsdk activate 3.1.2
-          pip install jupyterlite-xeus-python.tar.gz
+        run: pip install jupyterlite-xeus-python.tar.gz
 
       - name: Run tests
         run: pytest -rP tests/test_xeus_python_env.py
@@ -216,10 +207,7 @@ jobs:
           python-version: "3.10"
 
       - name: Install
-        run: |
-          emsdk install 3.1.2
-          emsdk activate 3.1.2
-          pip install jupyterlite-xeus-python.tar.gz
+        run: pip install jupyterlite-xeus-python.tar.gz
 
       - name: Run tests
         run: pytest -rP tests/test_xeus_python_env.py

Dockerfile

@@ -4,19 +4,8 @@ ARG MAMBA_DOCKERFILE_ACTIVATE=1
 ARG PYTHON_VERSION=3.10
 
 RUN micromamba install --yes -c conda-forge \
-    git pip python=$PYTHON_VERSION click typer emsdk
-
-##################################################################
-# Install empack
-##################################################################
-
-RUN pip install empack>=0.5.2
-
-##################################################################
-# Setup emsdk
-##################################################################
-
-RUN emsdk install 3.1.2 && emsdk activate 3.1.2
+    git pip python=$PYTHON_VERSION click typer \
+    "emsdk>=3.1.11" "empack>=0.5.3"
 
 ##################################################################
 # Create emscripten env and pack it

environment.yml

@@ -5,7 +5,7 @@ dependencies:
   - python
   - pip
   - pytest
-  - emsdk
+  - emsdk >=3.1.11
+  - empack >=0.5.3
   - pip:
     - jupyterlite
-    - empack

jupyterlite_xeus_python/env_build_addon.py

@@ -81,7 +81,9 @@ def __init__(self, *args, **kwargs):
         self.root_prefix = "/tmp/xeus-python-kernel"
         self.env_name = "xeus-python-kernel"
 
-        self.prefix_path.mkdir(parents=True, exist_ok=True)
+        # Cleanup tmp dir in case it's not empty
+        shutil.rmtree(self.root_prefix, ignore_errors=True)
+        Path(self.root_prefix).mkdir(parents=True, exist_ok=True)
 
         self.orig_config = os.environ.get("CONDARC")
 
@@ -91,9 +93,6 @@ def pre_build(self, manager):
         if not self.packages:
             return []
 
-        # Cleanup tmp dir
-        shutil.rmtree(self.root_prefix, ignore_errors=True)
-
         # Create emscripten env with the given packages
         self.create_env()
 
@@ -159,6 +158,8 @@ def create_env(self):
             channels.extend(["-c", channel])
 
         if MAMBA_AVAILABLE:
+            # Mamba needs the directory to exist already
+            self.prefix_path.mkdir(parents=True, exist_ok=True)
             return self._create_env_with_config("mamba", channels)
 
         if MICROMAMBA_AVAILABLE: