From 15f3c512e02c469c02e28d9b90c0b19974e03c9f Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Wed, 13 Mar 2024 17:22:36 +0100 Subject: [PATCH] use pyjs 2.0.0 (#617) * use pyjs_core * use pyjs_core * use 2.0.0 * redo * redo --- CMakeLists.txt | 2 +- environment-wasm-host.yml | 2 +- src/main_wasm.cpp | 2 +- wasm_patches/post.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2fb73ab..89f0a771 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ set(xeus-zmq_REQUIRED_VERSION 1.2.0) set(xeus-lite_REQUIRED_VERSION 1.0.1) set(pybind11_REQUIRED_VERSION 2.6.1) set(pybind11_json_REQUIRED_VERSION 0.2.8) -set(pyjs_REQUIRED_VERSION 1.3.2) +set(pyjs_REQUIRED_VERSION 2.0.0) if (NOT TARGET xtl) find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED) diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml index 7a7a5169..ee6a1efd 100644 --- a/environment-wasm-host.yml +++ b/environment-wasm-host.yml @@ -13,6 +13,6 @@ dependencies: - xeus-lite - xeus - xeus-python-shell>=0.5 - - pyjs>=1.0.0 + - pyjs>=2.0.0 - requests-wasm-polyfill>=0.3.0 - libpython \ No newline at end of file diff --git a/src/main_wasm.cpp b/src/main_wasm.cpp index 9c6e9d8e..7a895a97 100644 --- a/src/main_wasm.cpp +++ b/src/main_wasm.cpp @@ -18,7 +18,7 @@ #include "xeus/xembind.hpp" #include "xeus-python/xinterpreter_wasm.hpp" -PYBIND11_EMBEDDED_MODULE(pyjs, m) { +PYBIND11_EMBEDDED_MODULE(pyjs_core, m) { pyjs::export_pyjs_module(m); } diff --git a/wasm_patches/post.js b/wasm_patches/post.js index 8d7276cd..ac0ebdf5 100644 --- a/wasm_patches/post.js +++ b/wasm_patches/post.js @@ -14,6 +14,6 @@ Module['async_init'] = async function( return Module['bootstrap_from_empack_packed_environment']( `${kernel_root_url}/empack_env_meta.json`, /* packages_json_url */ pkg_root_url, /* package_tarballs_root_url */ - verbose /* verbose */ + verbose /* verbose */ ); } \ No newline at end of file