Merge pull request #1 from emscripten-forge/newver

use new version

Author: DerThorsten

.github/workflows/main.yml

@@ -29,25 +29,25 @@ jobs:
       - name: Install mamba
         uses: mamba-org/provision-with-micromamba@main
         with:
-          environment-file: env.yaml
-          environment-name: pyjs-wasm
+          environment-file: build-env.yaml
+          environment-name: pyjs-build-env
           micromamba-version: "0.23.2"
 
 
       - name: build page
         run: |
-          micromamba activate pyjs-wasm
+          micromamba activate pyjs-build-env
 
           
           mkdir build
           pushd build
 
-          micromamba create -n pyjs-browser-env \
+          micromamba create -n pyjs-web-env \
             --platform=emscripten-32 \
             -c https://repo.mamba.pm/emscripten-forge \
             -c https://repo.mamba.pm/conda-forge \
             --yes \
-            "pyjs==0.8.0" numpy
+            -f $GITHUB_WORKSPACE/web-env.yaml
 
 
           # donload empack config
@@ -57,7 +57,7 @@ jobs:
 
 
           # pack the environment in a js/data file
-          empack pack env --env-prefix $MAMBA_ROOT_PREFIX/envs/pyjs-browser-env --outname python_data --config empack_config.yaml
+          empack pack env --env-prefix $MAMBA_ROOT_PREFIX/envs/pyjs-web-env --outname python_data --config empack_config.yaml
 
 
           # copy relevant files from build to page
@@ -66,7 +66,7 @@ jobs:
 
 
           # copy relevant files from env to page
-          cp $MAMBA_ROOT_PREFIX/envs/pyjs-browser-env/lib_js/pyjs/pyjs_runtime_browser* ../page
+          cp $MAMBA_ROOT_PREFIX/envs/pyjs-web-env/lib_js/pyjs/pyjs_runtime_browser* ../page
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

env.yaml renamed to build-env.yaml

@@ -1,4 +1,4 @@
-name: pyjs-wasm
+name: pyjs-build-env
 channels:
   - conda-forge
 dependencies:

build_page.sh

@@ -2,13 +2,13 @@
 set -e
 
 # install wasm env
-rm -rf $MAMBA_ROOT_PREFIX/envs/pyjs-build-wasm
-micromamba create -n pyjs-build-wasm \
+rm -rf $MAMBA_ROOT_PREFIX/envs/pyjs-web-env
+micromamba create -n pyjs-web-env \
     --platform=emscripten-32 \
     -c https://repo.mamba.pm/emscripten-forge \
     -c https://repo.mamba.pm/conda-forge \
     --yes \
-    "pyjs==0.8.0" numpy
+    -f web-env.yaml
 
 # create build/work dir
 mkdir -p build
@@ -21,15 +21,15 @@ wget -O $EMPACK_CONFIG https://raw.githubusercontent.com/emscripten-forge/recipe
 
 
 # pack the environment in a js/data file
-empack pack env --env-prefix $MAMBA_ROOT_PREFIX/envs/pyjs-build-wasm --outname python_data --config empack_config.yaml
+empack pack env --env-prefix $MAMBA_ROOT_PREFIX/envs/pyjs-web-env --outname python_data --config empack_config.yaml
 
 
 # copy relevant files from build to page
 cp python_data.js   ../page  
 cp python_data.data ../page
 
 # copy relevant files from env to page
-cp $MAMBA_ROOT_PREFIX/envs/pyjs-build-wasm/lib_js/pyjs/pyjs_runtime_browser* ../page
+cp $MAMBA_ROOT_PREFIX/envs/pyjs-web-env/lib_js/pyjs/pyjs_runtime_browser* ../page
 
 cd ../page
 

page/script.js

@@ -94,9 +94,8 @@ var Module = {};
   pyjs.setStatus = setStatus
   addToOutput("Download data ...")
   var promise_core = await import('./python_data.js')
-  pyjs.init()
+  await pyjs.init()
 
-  var deps = await pyjs._wait_run_dependencies()
   addToOutput("...done")
   interpreter =  new pyjs.Interpreter()
   main_scope = pyjs.main_scope()

web-env.yaml

@@ -0,0 +1,7 @@
+name: pyjs-web-env
+channels:
+  - https://repo.mamba.pm/emscripten-forge
+  - conda-forge
+dependencies:
+  - pyjs == 0.9.0
+  - numpy