diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2d09891..a7f9c2c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,7 +20,10 @@ jobs: strategy: fail-fast: false matrix: - emsdk_ver: ["3.1.58"] + include: + - emsdk_ver: "3.1.45" + python_version: "3.11" + steps: - uses: actions/checkout@v2 @@ -28,26 +31,28 @@ jobs: - name: Get number of CPU cores uses: SimenB/github-actions-cpu-cores@v1 - - name: Install micromamba uses: mamba-org/setup-micromamba@v1 with: - environment-file: environment-dev.yml + environment-file: environment-dev_${{matrix.emsdk_ver}}.yml environment-name: pyjs-wasm - + condarc: | + channels: + - https://repo.mamba.pm/emscripten-forge + - conda-forge + - name: build the docs shell: bash -el {0} run: | - ./build_mkdocs.sh + ./build_mkdocs.sh ${{matrix.emsdk_ver}} ${{ matrix.python_version }} - ################################################################ # upload to github pages ################################################################ - name: Upload Pages artifact uses: actions/upload-pages-artifact@v2 with: - path: docs_build/mkdocs + path: docs_build/mkdocs deploy: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8cbd1f5..1807f31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,13 @@ jobs: strategy: fail-fast: false matrix: - emsdk_ver: ["3.1.58"] + include: + - emsdk_ver: "3.1.45" + python_version: "3.11" + pybind11_version: "<2.12.0" + # - emsdk_ver: "3.1.58" + # python_version: "3.12" + # pybind11_version: "" steps: - uses: actions/checkout@v2 @@ -28,32 +34,30 @@ jobs: - name: Install micromamba uses: mamba-org/setup-micromamba@v1 with: - environment-file: environment-dev.yml + environment-file: environment-dev_${{matrix.emsdk_ver}}.yml environment-name: pyjs-wasm - - + condarc: | + channels: + - https://repo.mamba.pm/emscripten-forge + - conda-forge + - name: Install Playwright run: | playwright install - - - name: Setup emsdk - shell: bash -el {0} - run: | - ./emsdk/setup_emsdk.sh ${{ matrix.emsdk_ver }} $(pwd)/emsdk_install - name: Build pyjs run: | micromamba activate pyjs-wasm - emsdk activate ${{matrix.emsdk_ver}} - source $(pwd)/emsdk_install/emsdk_env.sh + # emsdk activate ${{matrix.emsdk_ver}} + # source $(pwd)/emsdk_install/emsdk_env.sh micromamba create -n pyjs-build-wasm \ --platform=emscripten-wasm32 \ -c https://repo.mamba.pm/emscripten-forge \ -c https://repo.mamba.pm/conda-forge \ --yes \ - python pybind11 nlohmann_json pybind11_json numpy "pytest==7.1.1" bzip2 sqlite zlib zstd libffi exceptiongroup + python=${{matrix.python_version}} "pybind11${{matrix.pybind11_version}}" nlohmann_json pybind11_json "numpy<2" "pytest==7.1.1" bzip2 sqlite zlib zstd libffi exceptiongroup emscripten-abi==${{matrix.emsdk_ver}} mkdir build @@ -87,7 +91,7 @@ jobs: -c https://repo.mamba.pm/emscripten-forge \ -c https://repo.mamba.pm/conda-forge \ --yes \ - python "pytest==7.1.1" numpy exceptiongroup + "python=${{matrix.python_version}}" "pytest==7.1.1" "numpy<2" exceptiongroup - name: Test in browser-main @@ -128,7 +132,7 @@ jobs: -c https://repo.mamba.pm/emscripten-forge \ -c https://repo.mamba.pm/conda-forge \ --yes \ - python "pytest==7.1.1" exceptiongroup + "python=${{matrix.python_version}}" "pytest==7.1.1" exceptiongroup - name: Test in browser-main-no-numpy run: | diff --git a/build_mkdocs.sh b/build_mkdocs.sh index dbbdb5f..bb454ec 100755 --- a/build_mkdocs.sh +++ b/build_mkdocs.sh @@ -5,18 +5,12 @@ set -e THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" WASM_ENV_NAME=pyjs-wasm-dev WASM_ENV_PREFIX=$MAMBA_ROOT_PREFIX/envs/$WASM_ENV_NAME -EMSDK_DIR=$THIS_DIR/emsdk_install -EMSDK_VERSION="3.1.58" +EMSDK_DIR=$WASM_ENV_PREFIX/opt/emsdk +EMSDK_VERSION=$1 +PYTHON_VERSION=$2 - - -if [ ! -d "$EMSDK_DIR" ]; then - echo "Creating emsdk dir $EMSDK_DIR" - $THIS_DIR/emsdk/setup_emsdk.sh $EMSDK_VERSION $EMSDK_DIR -else - echo "Emsdk dir $EMSDK_DIR already exists" -fi + PYJS_PROBE_FILE=$WASM_ENV_PREFIX/lib_js/pyjs/pyjs_runtime_browser.js @@ -27,9 +21,9 @@ if [ ! -d "$WASM_ENV_PREFIX" ]; then -c https://repo.mamba.pm/emscripten-forge \ -c https://repo.mamba.pm/conda-forge \ --yes \ - python pybind11 nlohmann_json pybind11_json numpy \ - bzip2 sqlite zlib zstd libffi exceptiongroup \ - "xeus<4" "xeus-lite<2" xeus-python "xeus-javascript>=0.3.2" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2" + python=$PYTHON_VERSION "pybind11" nlohmann_json pybind11_json numpy \ + bzip2 sqlite zlib zstd libffi exceptiongroup\ + "xeus" "xeus-lite" xeus-python "xeus-javascript" xtl "ipython=8.22.2=py311had7285e_1" "traitlets>=5.14.2" else echo "Wasm env $WASM_ENV_NAME already exists" @@ -42,8 +36,7 @@ if true; then echo "Building pyjs" cd $THIS_DIR - source $EMSDK_DIR/emsdk_env.sh - + mkdir -p build cd build @@ -69,7 +62,7 @@ fi # if there is no xeus-python dir, clone it if [ ! -d "$THIS_DIR/xeus-python" ]; then cd $THIS_DIR - git clone -b pyjs_update https://github.com/DerThorsten/xeus-python/ + git clone https://github.com/jupyter-xeus/xeus-python/ else echo "xeus-python dir already exists" fi @@ -81,7 +74,7 @@ if true; then echo "Building xeus-python" cd $THIS_DIR - source $EMSDK_DIR/emsdk_env.sh + # source $EMSDK_DIR/emsdk_env.sh cd xeus-python @@ -98,11 +91,15 @@ if true; then cd build_wasm + # # this is stupid + # cp -r $WASM_ENV_PREFIX/include/python3.11/ $WASM_ENV_PREFIX/include/ + emcmake cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DXPYT_EMSCRIPTEN_WASM_BUILD=ON\ + -DXPYT_EMSCRIPTEN_WASM_BUILD=ON \ + -DCMAKE_INCLUDE_PATH=$WASM_ENV_PREFIX/include/python3.11 emmake make -j8 install @@ -119,7 +116,7 @@ if false; then echo "Building xeus-javascript" cd $THIS_DIR - source $EMSDK_DIR/emsdk_env.sh + # source $EMSDK_DIR/emsdk_env.sh cd ~/src/xeus-javascript diff --git a/emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch b/emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch deleted file mode 100644 index 179450c..0000000 --- a/emsdk/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 137dae4dbdf9a192551582cdae827b085510956f Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Fri, 2 Jun 2023 11:59:32 -0700 -Subject: [PATCH 1/6] Add back fs.findObject and fs.readFile in loadLibData - -See upstream PR: -https://github.com/emscripten-core/emscripten/pull/19513 ---- - src/library_dylink.js | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/library_dylink.js b/src/library_dylink.js -index aa90bea2b..1e67818a1 100644 ---- a/src/library_dylink.js -+++ b/src/library_dylink.js -@@ -994,14 +994,23 @@ var LibraryDylink = { - #endif - - // for wasm, we can use fetch for async, but for fs mode we can only imitate it -+ var libData; - if (handle) { - var data = {{{ makeGetValue('handle', C_STRUCTS.dso.file_data, '*') }}}; - var dataSize = {{{ makeGetValue('handle', C_STRUCTS.dso.file_data_size, '*') }}}; - if (data && dataSize) { -- var libData = HEAP8.slice(data, data + dataSize); -- return flags.loadAsync ? Promise.resolve(libData) : libData; -+ libData = HEAP8.slice(data, data + dataSize); - } - } -+ if (!libData && flags.fs && flags.fs.findObject(libName)) { -+ libData = flags.fs.readFile(libName, {encoding: 'binary'}); -+ if (!(libData instanceof Uint8Array)) { -+ libData = new Uint8Array(libData); -+ } -+ } -+ if (libData) { -+ return flags.loadAsync ? Promise.resolve(libData) : libData; -+ } - - var libFile = locateFile(libName); - if (flags.loadAsync) { --- -2.34.1 - diff --git a/emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch b/emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch deleted file mode 100644 index 2f49f60..0000000 --- a/emsdk/patches/0002-Add-useful-error-when-symbol-resolution-fails.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e0cb884277200310eba263dcce5a7b1c4567bae6 Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Fri, 19 May 2023 12:19:00 -0700 -Subject: [PATCH 2/6] Add useful error when symbol resolution fails - -Currently if symbol resolution fails, we get: -```js -TypeError: Cannot read properties of undefined (reading 'apply') -``` -It is very hard for newcomers to Emscripten to recognize this as a -symbol resolution error. Even for people experienced with this message, -it has the annoyance that it doesn't give any hint as to which symbol -went missing. - -This adds a descriptive error message with the name of the missing -symbol. ---- - src/library_dylink.js | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/library_dylink.js b/src/library_dylink.js -index 1e67818a1..cea3ce05d 100644 ---- a/src/library_dylink.js -+++ b/src/library_dylink.js -@@ -709,6 +709,9 @@ var LibraryDylink = { - var resolved; - stubs[prop] = (...args) => { - resolved ||= resolveSymbol(prop); -+ if (!resolved) { -+ throw new Error(`Dynamic linking error: cannot resolve symbol ${prop}`); -+ } - return resolved(...args); - }; - } --- -2.34.1 - diff --git a/emsdk/patches/0003-Changes-for-JSPI.patch b/emsdk/patches/0003-Changes-for-JSPI.patch deleted file mode 100644 index 42f189b..0000000 --- a/emsdk/patches/0003-Changes-for-JSPI.patch +++ /dev/null @@ -1,87 +0,0 @@ -From d4d5d35072b6d28c5f98b77a0d578e01bd25ef7e Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Thu, 22 Jun 2023 18:53:22 -0700 -Subject: [PATCH 3/6] Changes for JSPI - ---- - src/library.js | 2 +- - src/library_dylink.js | 3 ++- - src/parseTools.mjs | 2 +- - src/preamble.js | 7 +++++++ - 4 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/library.js b/src/library.js -index 44531ee1d..f02e85ea2 100644 ---- a/src/library.js -+++ b/src/library.js -@@ -1269,7 +1269,7 @@ addToLibrary({ - #if EXCEPTION_STACK_TRACES - throw new EmscriptenSjLj; - #else -- throw Infinity; -+ throw Module.wrapException(Infinity); - #endif - }, - #elif !SUPPORT_LONGJMP -diff --git a/src/library_dylink.js b/src/library_dylink.js -index cea3ce05d..c3f3c2bbf 100644 ---- a/src/library_dylink.js -+++ b/src/library_dylink.js -@@ -73,6 +73,7 @@ var LibraryDylink = { - #if !DISABLE_EXCEPTION_CATCHING || SUPPORT_LONGJMP == 'emscripten' - $createInvokeFunction__internal: true, - $createInvokeFunction__deps: ['$dynCall', 'setThrew', '$stackSave', '$stackRestore'], -+ $createInvokeFunction__postset: "if(!Module.createInvoke) { Module.createInvoke = Module.createInvokeFunction; }", - $createInvokeFunction: (sig) => { - return function() { - var sp = stackSave(); -@@ -125,7 +126,7 @@ var LibraryDylink = { - // Asm.js-style exception handling: invoke wrapper generation - else if (symName.startsWith('invoke_')) { - // Create (and cache) new invoke_ functions on demand. -- sym = wasmImports[symName] = createInvokeFunction(symName.split('_')[1]); -+ sym = wasmImports[symName] = Module.createInvoke(symName.split('_')[1]); - } - #endif - #if !DISABLE_EXCEPTION_CATCHING -diff --git a/src/parseTools.mjs b/src/parseTools.mjs -index 7f20321c3..118a32078 100644 ---- a/src/parseTools.mjs -+++ b/src/parseTools.mjs -@@ -581,7 +581,7 @@ function makeThrow(excPtr) { - } - return `assert(false, '${assertInfo}');`; - } -- return `throw ${excPtr};`; -+ return `throw Module.wrapException(${excPtr});`; - } - - function storeException(varName, excPtr) { -diff --git a/src/preamble.js b/src/preamble.js -index 18cf93959..57a7245ab 100644 ---- a/src/preamble.js -+++ b/src/preamble.js -@@ -18,6 +18,10 @@ - #include "runtime_pthread.js" - #endif - -+if(!Module.wrapException) { -+ Module.wrapException = (e) => e; -+} -+ - #if RELOCATABLE - {{{ makeModuleReceiveWithVar('dynamicLibraries', undefined, '[]', true) }}} - #endif -@@ -942,6 +946,9 @@ function getWasmImports() { - // Receives the wasm imports, returns the exports. - function createWasm() { - var info = getWasmImports(); -+ if (Module.adjustWasmImports) { -+ Module.adjustWasmImports(info); -+ } - // Load the wasm module and create an instance of using native support in the JS engine. - // handle a generated wasm instance, receiving its exports and - // performing other necessary setup --- -2.34.1 - diff --git a/emsdk/patches/0004-Upstream-PR-https-github.com-emscripten-core-emscrip.patch b/emsdk/patches/0004-Upstream-PR-https-github.com-emscripten-core-emscrip.patch deleted file mode 100644 index 294ded3..0000000 --- a/emsdk/patches/0004-Upstream-PR-https-github.com-emscripten-core-emscrip.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9352fac9a4618603fbe5ce7ad97a26a3963704bd Mon Sep 17 00:00:00 2001 -From: Joe Marshall -Date: Sat, 13 Apr 2024 21:41:11 +0100 -Subject: [PATCH 4/6] Upstream PR: - https://github.com/emscripten-core/emscripten/pull/21759 - ---- - src/library_dylink.js | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/library_dylink.js b/src/library_dylink.js -index c3f3c2bbf..e0fa4721c 100644 ---- a/src/library_dylink.js -+++ b/src/library_dylink.js -@@ -93,6 +93,10 @@ var LibraryDylink = { - if (e !== e+0) throw e; - #endif - _setThrew(1, 0); -+ // In theory this if could be done on creating the function, -+ // but I just added this to save wasting code space -+ // and it only happens on an exception -+ if (sig[0] == "j") return 0n; - } - } - }, --- -2.34.1 - diff --git a/emsdk/patches/0005-Raise-when-no-argument-is-given.patch b/emsdk/patches/0005-Raise-when-no-argument-is-given.patch deleted file mode 100644 index 1096313..0000000 --- a/emsdk/patches/0005-Raise-when-no-argument-is-given.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 44983793a7f67009c228c5c95899f6fe735fd1c5 Mon Sep 17 00:00:00 2001 -From: ryanking13 -Date: Sat, 20 Jan 2024 19:02:32 +0900 -Subject: [PATCH 5/6] Raise when no argument is given - -Emscripten 3.1.51 does not raise an error when no argument is given. -Some build tools (e.g. ffmpeg) relies on this behavior, so we should -keep it. - -Upstream issue: https://github.com/emscripten-core/emscripten/issues/21116 ---- - emcc.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/emcc.py b/emcc.py -index 6be37b217..a77f41c4a 100644 ---- a/emcc.py -+++ b/emcc.py -@@ -628,6 +628,9 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR P - print(libname) - return 0 - -+ if not input_files and not state.link_flags: -+ exit_with_error('no input files') -+ - if options.reproduce: - create_reproduce_file(options.reproduce, args) - --- -2.34.1 - diff --git a/emsdk/patches/0006-Load-dependent-libs-globally.patch b/emsdk/patches/0006-Load-dependent-libs-globally.patch deleted file mode 100644 index 0dba49e..0000000 --- a/emsdk/patches/0006-Load-dependent-libs-globally.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2f3ae3b30cf8ce8cd04d512ebb4c8b2218563085 Mon Sep 17 00:00:00 2001 -From: Hood Chatham -Date: Mon, 17 Jun 2024 18:32:07 -0700 -Subject: [PATCH 6/6] Load dependent libs globally - -I'm not 100% sure why, but we need all dependent shared libs to be loaded -globally. ---- - src/library_dylink.js | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/library_dylink.js b/src/library_dylink.js -index e0fa4721c..502bc7b25 100644 ---- a/src/library_dylink.js -+++ b/src/library_dylink.js -@@ -880,11 +880,15 @@ var LibraryDylink = { - - // now load needed libraries and the module itself. - if (flags.loadAsync) { -+ const origGlobal = flags.global; -+ flags.global = true; - return metadata.neededDynlibs - .reduce((chain, dynNeeded) => chain.then(() => - loadDynamicLibrary(dynNeeded, flags) - ), Promise.resolve()) -- .then(loadModule); -+ .then(() => { -+ flags.global = origGlobal; -+ }).then(loadModule); - } - - metadata.neededDynlibs.forEach((needed) => loadDynamicLibrary(needed, flags, localScope)); --- -2.34.1 - diff --git a/emsdk/patches/LICENSE b/emsdk/patches/LICENSE deleted file mode 100644 index a612ad9..0000000 --- a/emsdk/patches/LICENSE +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/emsdk/setup_emsdk.sh b/emsdk/setup_emsdk.sh deleted file mode 100755 index 349c8f1..0000000 --- a/emsdk/setup_emsdk.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# first argument is the emscripten version to install -EMSCRIPTEN_VERSION=$1 -# second argument is path to clone emsdk to -EMSDK_PATH=$2 - -# check if emscripten version is set -if [ -z "$EMSCRIPTEN_VERSION" ]; then - echo "No emscripten version set. The first argument of this script should be the emscripten version to install." - exit 1 -fi - -# check if emsdk path is set -if [ -z "$EMSDK_PATH" ]; then - echo "No emsdk path set. The second argument of this script should be the path to clone emsdk to." - exit 1 -fi - - -# dir of this file -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -PATCH_DIR=$SCRIPT_DIR/patches - - -set -e - -echo "------------------------------------" -echo "Installing emsdk" -echo "------------------------------------" - - -echo "...cloning emsdk" -git clone --depth 1 https://github.com/emscripten-core/emsdk.git $EMSDK_PATH - - -pushd $EMSDK_PATH -echo "emsdk install ..." -./emsdk install --build=Release $EMSCRIPTEN_VERSION -echo "...done" - -echo "emsdk patching" -pushd upstream/emscripten -cat $PATCH_DIR/*.patch | patch -p1 --verbose -popd -echo "...done" - -echo "emsdk building ..." -./emsdk install --build=Release $EMSCRIPTEN_VERSION ccache-git-emscripten-64bit -echo "...done" - -echo "emsdk activating ..." -./emsdk activate --embedded --build=Release $EMSCRIPTEN_VERSION -echo "...done" -popd - - -echo "create .emsdkdir file in home directory ..." -echo $EMSDK_PATH > ~/.emsdkdir -echo "...done" \ No newline at end of file diff --git a/environment-dev.yml b/environment-dev_3.1.45.yml similarity index 90% rename from environment-dev.yml rename to environment-dev_3.1.45.yml index 7b55ef0..c91225b 100644 --- a/environment-dev.yml +++ b/environment-dev_3.1.45.yml @@ -4,13 +4,13 @@ channels: dependencies: - cmake - pip - - python=3.10 + - python - yarn - click - empack >=3.0.1 - microsoft::playwright - ninja - - nodejs >= 18.7.0 + - nodejs - pyjs_code_runner >= 2.0.1 - exceptiongroup # documentation @@ -27,6 +27,7 @@ dependencies: - notebook >=7,<8 # to include the extension to switch between JupyterLab and Notebook # pyjs_code_runner dev deps - hatchling + - emscripten_emscripten-wasm32 == 3.1.45 - pip: - JLDracula - pyjs_code_runner >= 3.0 diff --git a/environment-dev_3.1.58.yml b/environment-dev_3.1.58.yml new file mode 100644 index 0000000..1525559 --- /dev/null +++ b/environment-dev_3.1.58.yml @@ -0,0 +1,33 @@ +name: pyjs-wasm +channels: + - conda-forge +dependencies: + - cmake + - pip + - python + - yarn + - click + - empack >=3.0.1 + - microsoft::playwright + - ninja + - nodejs + - pyjs_code_runner >= 2.0.1 + - exceptiongroup + # documentation + - jupytext + - mkdocs + - mkdocstrings + - mkdocstrings-python + - mkdocs-material + - empack >=3.2.0 + - jupyter_server # to enable contents + - jupyterlite + - jupyterlite-xeus + - jupyterlite-sphinx + - notebook >=7,<8 # to include the extension to switch between JupyterLab and Notebook + # pyjs_code_runner dev deps + - hatchling + - emscripten_emscripten-wasm32 == 3.1.58 + - pip: + - JLDracula + - pyjs_code_runner >= 3.0