From b524b82bc46c34427a2888de2b5d8c6c8a943d6e Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 27 May 2024 13:53:34 +0200 Subject: [PATCH 01/20] continue on fail --- .github/workflows/build_recipes.yaml | 2 +- recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_recipes.yaml b/.github/workflows/build_recipes.yaml index 1f072fb54..498ef30f8 100644 --- a/.github/workflows/build_recipes.yaml +++ b/.github/workflows/build_recipes.yaml @@ -98,6 +98,6 @@ jobs: mkdir -p ${GITHUB_WORKSPACE}/output/${platform} for package in $(ls ${GITHUB_WORKSPACE}/output/${platform}/*.tar.bz2); do echo "Uploading ${package} for ${platform} (build with rattler)" - QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client -u https://beta.mamba.pm post_file_to_channel emscripten-forge ${package} + QUETZ_API_KEY=${{ secrets.QUETZ_API_KEY}} quetz-client -u https://beta.mamba.pm post_file_to_channel emscripten-forge ${package} || true done done \ No newline at end of file diff --git a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index b3fd3626b..775f8be4e 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -3,7 +3,7 @@ context: version: 3.1.45 build: - number: 26 + number: 27 outputs: - package: From ed16e18a9c720e9a4150d2f2b891d41463f340f5 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Wed, 12 Jun 2024 10:09:23 +0200 Subject: [PATCH 02/20] my changes --- conda_build_config.yaml | 27 ++++++++---- pixi.toml | 14 ++++++ .../emscripten_emscripten-wasm32/recipe.yaml | 4 +- recipes/recipes_emscripten/pyjs/recipe.yaml | 43 ++++++++++++++++--- 4 files changed, 71 insertions(+), 17 deletions(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 7cec803e4..ea2ce3fa1 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -9,32 +9,35 @@ c_compiler: then: - clang -c_compiler_version: + + +cxx_compiler: - if: emscripten then: - - 3 + - emscripten - if: linux then: - - 9 + - gxx - if: osx then: - - 11 + - clangxx -cxx_compiler: +c_compiler_version: - if: emscripten then: - - emscripten + - 3.1.45 - if: linux then: - - gxx + - 9 - if: osx then: - - clangxx + - 11 + cxx_compiler_version: - if: emscripten then: - - 3 + - 3.1.45 - if: linux then: - 9 @@ -42,6 +45,12 @@ cxx_compiler_version: then: - 11 +zip_keys: + - + - cxx_compiler_version + - c_compiler_version + + cuda_compiler: - undefined cuda_compiler_version: diff --git a/pixi.toml b/pixi.toml index e5c4c1c11..babce79f2 100644 --- a/pixi.toml +++ b/pixi.toml @@ -81,6 +81,20 @@ cmd = [ "--recipe" ] +[feature.feature_rattler_build.tasks.build-pkg] +cmd = [ + "rattler-build","build", + # format + "--package-format", "tar-bz2", + # channels + "-c", "https://repo.mamba.pm/emscripten-forge", + "-c", "conda-forge", + "-c", "microsoft", + "--skip-existing", "local", + "-m", "conda_build_config.yaml", + "--recipe" +] + ############################################ # documentation feature / tasks diff --git a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index 775f8be4e..6fd9b2206 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -1,9 +1,9 @@ context: name: emscripten_emscripten-wasm32 - version: 3.1.45 + version: 3.1.58 build: - number: 27 + number: 0 outputs: - package: diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index 3f5695019..2eec83a62 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -1,17 +1,14 @@ context: - version: 2.0.0 + version: 2.0.1 name: pyjs package: name: ${{name}} version: ${{ version }} source: -- url: - https://github.com/emscripten-forge/${{name}}/archive/refs/tags/${{version}}.tar.gz - sha256: 668f36da03ab81d35850205c47e96e1c08afc20559d72dc3c734bba2c678b826 - +- path: /Users/thorstenbeier/src/pyjs build: - number: 1 + number: 3 requirements: build: @@ -27,6 +24,40 @@ requirements: - libffi - pybind11 + +tests: + - script: | + echo "install playwright" + $BUILD_PREFIX/bin/playwright install + echo "test in browser (main thread) + pyjs_code_runner run script \ + browser-main \ + --conda-env $PREFIX \ + --mount $(pwd)/tests:/tests \ + --script main.py \ + --work-dir /tests \ + --pyjs-dir $(pwd)/build \ + --headless \ + --async-main \ + --no-cache + + requirements: + build: + - pyjs_code_runner + - if: linux + then: + - playwright < 1.42 + - if: osx + then: + - playwright + run: + - pytest + - numpy + files: + recipe: + - test_regex.py + + about: license: BSD-3-Clause license_family: BSD From bd4d2f00ec0793fd85466420a108b88299ae52e1 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 13 Jun 2024 15:30:27 +0200 Subject: [PATCH 03/20] use pyjs-code-runner >=3 --- pixi.toml | 4 +-- recipes/recipes/pytester/recipe.yaml | 2 +- recipes/recipes_emscripten/pyjs/recipe.yaml | 35 ++++++++++++--------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/pixi.toml b/pixi.toml index 9d51d2f85..1e1e46e99 100644 --- a/pixi.toml +++ b/pixi.toml @@ -12,7 +12,7 @@ platforms = ["osx-arm64", "osx-64", "linux-64"] ############################################ [feature.feature_rattler_build] [feature.feature_rattler_build.dependencies] -rattler-build = ">= 0.14.0" +rattler-build = ">= 0.17.0" python = "3.11.*" typer = "*" @@ -76,7 +76,7 @@ cmd = [ "-c", "microsoft", "-c", "conda-forge", "--target-platform", "emscripten-wasm32", - "--skip-existing", "local", + # "--skip-existing", "local", "-m", "conda_build_config.yaml", "--recipe" ] diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index 393a568a8..f44f3dce1 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -21,7 +21,7 @@ outputs: host: - python run: - - pyjs_code_runner + - pyjs_code_runner >=3.0.0 - if: linux then: - playwright < 1.42 diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index f3c6889ec..3638d5e1f 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -1,15 +1,15 @@ context: - version: 2.0.1 + version: 2.0.3 name: pyjs package: name: ${{name}} version: ${{ version }} source: -- path: /Users/thorstenbeier/src/pyjs - + url: https://github.com/emscripten-forge/pyjs/archive/refs/tags/v${{ version }}.tar.gz + sha256: 8633dfd8b5bf9403e6b9c02c582557dcc49226034689032939b547c7dc431000 build: - number: 8 + number: 0 requirements: build: @@ -25,11 +25,8 @@ requirements: - libffi - pybind11 - tests: - script: | - echo "ls" - ls echo "install playwright" playwright install echo "test in browser (main thread)" @@ -39,26 +36,36 @@ tests: --mount $(pwd)/tests:/tests \ --script main.py \ --work-dir /tests \ - --pyjs-dir $(pwd)/build \ + --headless \ + --async-main \ + --no-cache + # worker + echo "test in browser (worker thread)" + pyjs_code_runner run script \ + browser-worker \ + --conda-env $PREFIX \ + --mount $(pwd)/tests:/tests \ + --script main.py \ + --work-dir /tests \ --headless \ --async-main \ --no-cache requirements: - build: - - pyjs_code_runner + build: - if: linux then: + - pyjs_code_runner >= 3.0.0 - playwright < 1.42 - - if: osx - then: + else: + - pyjs_code_runner >= 3.0.0 - playwright run: - pytest - numpy files: - recipe: - - test_regex.py + source: + - tests/**/* about: From 65e51ff076e54c1968e9a2532317c8fac4be2990 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 13 Jun 2024 15:34:43 +0200 Subject: [PATCH 04/20] undo --- recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index 34b358d0f..775f8be4e 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -3,7 +3,7 @@ context: version: 3.1.45 build: - number: 0 + number: 27 outputs: - package: From 45a2d13901a46dfa107a525a6e7df1038e821acd Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 13 Jun 2024 15:35:26 +0200 Subject: [PATCH 05/20] bump pytester version --- recipes/recipes/pytester/recipe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index f44f3dce1..4175fb009 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -13,7 +13,7 @@ outputs: version: ${{ version }} build: - number: 6 + number: 7 noarch: python @@ -34,7 +34,7 @@ outputs: name: pytester-run version: ${{ version }} build: - number: 6 + number: 7 noarch: generic requirements: run: From 6df9812fc528953325b8b9d093b6e6d29c99ef93 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 13 Jun 2024 15:43:43 +0200 Subject: [PATCH 06/20] use 2.1.0 --- recipes/recipes_emscripten/pyjs/recipe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index 3638d5e1f..e1d2cce35 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -1,12 +1,12 @@ context: - version: 2.0.3 + version: 2.1.0 name: pyjs package: name: ${{name}} version: ${{ version }} - + source: - url: https://github.com/emscripten-forge/pyjs/archive/refs/tags/v${{ version }}.tar.gz + url: https://github.com/emscripten-forge/pyjs/archive/refs/tags/${{ version }}.tar.gz sha256: 8633dfd8b5bf9403e6b9c02c582557dcc49226034689032939b547c7dc431000 build: number: 0 From b17048b6e85d34d4c284a1bc7a80ff4a721b903e Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 13 Jun 2024 16:05:54 +0200 Subject: [PATCH 07/20] relax playwright --- recipes/recipes/pytester/recipe.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index 4175fb009..ba33da463 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -22,12 +22,7 @@ outputs: - python run: - pyjs_code_runner >=3.0.0 - - if: linux - then: - - playwright < 1.42 - - if: osx - then: - - playwright + - playwright - package: From db00501c16c726d6994ad6cc613c217960eaa61a Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Thu, 13 Jun 2024 16:07:04 +0200 Subject: [PATCH 08/20] relax playwright --- recipes/recipes_emscripten/pyjs/recipe.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index e1d2cce35..045c72c82 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -53,13 +53,8 @@ tests: requirements: build: - - if: linux - then: - - pyjs_code_runner >= 3.0.0 - - playwright < 1.42 - else: - - pyjs_code_runner >= 3.0.0 - - playwright + - pyjs_code_runner >= 3.0.0 + - playwright run: - pytest - numpy From 8d76c0b9e3203a64caba638849848ba23d704a45 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 14 Jun 2024 09:24:25 +0200 Subject: [PATCH 09/20] exp --- recipes/recipes/pytester/recipe.yaml | 10 +++++++--- recipes/recipes_emscripten/pyjs/recipe.yaml | 9 +++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index ba33da463..0fcce2a7a 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -21,9 +21,13 @@ outputs: host: - python run: - - pyjs_code_runner >=3.0.0 - - playwright - + - if: linux + then: + - pyjs_code_runner >= 3.0.0 + - microsoft::playwright < 1.42 + else: + - pyjs_code_runner >= 3.0.0 + - microsoft::playwright - package: name: pytester-run diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index 045c72c82..a8fce61be 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -53,8 +53,13 @@ tests: requirements: build: - - pyjs_code_runner >= 3.0.0 - - playwright + - if: linux + then: + - pyjs_code_runner >= 3.0.0 + - microsoft::playwright < 1.42 + else: + - pyjs_code_runner >= 3.0.0 + - microsoft::playwright run: - pytest - numpy From bbb6e15c50f204388fdfedca4a562dbe0945ea27 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 14 Jun 2024 09:41:26 +0200 Subject: [PATCH 10/20] leq --- recipes/recipes/pytester/recipe.yaml | 2 +- recipes/recipes_emscripten/pyjs/recipe.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index 0fcce2a7a..733aa58d4 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -24,7 +24,7 @@ outputs: - if: linux then: - pyjs_code_runner >= 3.0.0 - - microsoft::playwright < 1.42 + - microsoft::playwright <= 1.42 else: - pyjs_code_runner >= 3.0.0 - microsoft::playwright diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index a8fce61be..8885ccea4 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -56,7 +56,7 @@ tests: - if: linux then: - pyjs_code_runner >= 3.0.0 - - microsoft::playwright < 1.42 + - microsoft::playwright <= 1.42 else: - pyjs_code_runner >= 3.0.0 - microsoft::playwright From 985f874004d7ff73579f9581d1456b03025bf43f Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 14 Jun 2024 09:44:05 +0200 Subject: [PATCH 11/20] no spaces --- recipes/recipes/pytester/recipe.yaml | 2 +- recipes/recipes_emscripten/pyjs/recipe.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index 733aa58d4..970578612 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -24,7 +24,7 @@ outputs: - if: linux then: - pyjs_code_runner >= 3.0.0 - - microsoft::playwright <= 1.42 + - microsoft::playwright <=1.42 else: - pyjs_code_runner >= 3.0.0 - microsoft::playwright diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index 8885ccea4..4025dbbb5 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -55,10 +55,10 @@ tests: build: - if: linux then: - - pyjs_code_runner >= 3.0.0 - - microsoft::playwright <= 1.42 + - pyjs_code_runner >=3.0.0 + - microsoft::playwright <=1.42 else: - - pyjs_code_runner >= 3.0.0 + - pyjs_code_runner >=3.0.0 - microsoft::playwright run: - pytest From 349ff6e1fe74cdfc765835fd307d4c640208f4fc Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 14 Jun 2024 09:44:19 +0200 Subject: [PATCH 12/20] no spaces --- recipes/recipes/pytester/recipe.yaml | 2 +- recipes/recipes_emscripten/pyjs/recipe.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index 970578612..a845002d5 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -24,7 +24,7 @@ outputs: - if: linux then: - pyjs_code_runner >= 3.0.0 - - microsoft::playwright <=1.42 + - microsoft::playwright <1.42 else: - pyjs_code_runner >= 3.0.0 - microsoft::playwright diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index 4025dbbb5..dd61e1032 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -56,7 +56,7 @@ tests: - if: linux then: - pyjs_code_runner >=3.0.0 - - microsoft::playwright <=1.42 + - microsoft::playwright <1.42 else: - pyjs_code_runner >=3.0.0 - microsoft::playwright From 6163039fd71335864574b924276eaecdfc40549a Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 14 Jun 2024 09:49:51 +0200 Subject: [PATCH 13/20] transitive --- recipes/recipes_emscripten/pyjs/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index dd61e1032..1d8169b07 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -53,6 +53,7 @@ tests: requirements: build: + - pytester - if: linux then: - pyjs_code_runner >=3.0.0 From 6ac515aef2d20ba24e3332431c7428f5255184a4 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Fri, 14 Jun 2024 09:58:09 +0200 Subject: [PATCH 14/20] lew --- recipes/recipes/pytester/recipe.yaml | 2 +- recipes/recipes_emscripten/pyjs/recipe.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes/pytester/recipe.yaml b/recipes/recipes/pytester/recipe.yaml index a845002d5..970578612 100644 --- a/recipes/recipes/pytester/recipe.yaml +++ b/recipes/recipes/pytester/recipe.yaml @@ -24,7 +24,7 @@ outputs: - if: linux then: - pyjs_code_runner >= 3.0.0 - - microsoft::playwright <1.42 + - microsoft::playwright <=1.42 else: - pyjs_code_runner >= 3.0.0 - microsoft::playwright diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index 1d8169b07..db65a2458 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -57,7 +57,7 @@ tests: - if: linux then: - pyjs_code_runner >=3.0.0 - - microsoft::playwright <1.42 + - microsoft::playwright <=1.42 else: - pyjs_code_runner >=3.0.0 - microsoft::playwright From 34f54116e27e39b7dd52413db065a45bf3d281cf Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Mon, 17 Jun 2024 07:54:38 +0200 Subject: [PATCH 15/20] Update recipe.yaml --- recipes/recipes_emscripten/pyjs/recipe.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index db65a2458..ffe3ad8a6 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -63,7 +63,6 @@ tests: - microsoft::playwright run: - pytest - - numpy files: source: - tests/**/* From ec9b6bbdb53347dd7c15d13e22fd07dd3469fe41 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 17 Jun 2024 10:37:17 +0200 Subject: [PATCH 16/20] added patches --- .../build_compiler_package.sh | 10 + ...Object-and-fs.readFile-in-loadLibDat.patch | 44 +++ ...l-error-when-symbol-resolution-fails.patch | 37 ++ .../patches/LICENSE | 373 ++++++++++++++++++ .../emscripten_emscripten-wasm32/recipe.yaml | 2 +- 5 files changed, 465 insertions(+), 1 deletion(-) create mode 100644 recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch create mode 100644 recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch create mode 100644 recipes/recipes/emscripten_emscripten-wasm32/patches/LICENSE diff --git a/recipes/recipes/emscripten_emscripten-wasm32/build_compiler_package.sh b/recipes/recipes/emscripten_emscripten-wasm32/build_compiler_package.sh index 5365935bc..01803207e 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/build_compiler_package.sh +++ b/recipes/recipes/emscripten_emscripten-wasm32/build_compiler_package.sh @@ -18,6 +18,16 @@ export EMSDK_PYTHON=${BUILD_PREFIX}/bin/python # export EMSDK=/Users/wolfv/Programs/emscripten-forge/emscripten_forge_emsdk_install export EMSDK=. + +echo "emsdk patching" +pushd upstream/emscripten +cat $RECIPE_DIR/patches/*.patch | patch -p1 --verbose +popd +echo "...done" + + + + mkdir -p $PREFIX/opt/emsdk/ cp -r $EMSDK/upstream $PREFIX/opt/emsdk/upstream rm -rf $PREFIX/opt/emsdk/upstream/emscripten/test/ diff --git a/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch b/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch new file mode 100644 index 000000000..5212949cd --- /dev/null +++ b/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-back-fs.findObject-and-fs.readFile-in-loadLibDat.patch @@ -0,0 +1,44 @@ +From 0170462a78e86de9ee95017bfa7e4a3dd620a375 Mon Sep 17 00:00:00 2001 +From: Hood Chatham +Date: Fri, 2 Jun 2023 11:59:32 -0700 +Subject: [PATCH] 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 d7676cdc2..f616d230d 100644 +--- a/src/library_dylink.js ++++ b/src/library_dylink.js +@@ -993,14 +993,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.25.1 + diff --git a/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch b/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch new file mode 100644 index 000000000..ec50727a1 --- /dev/null +++ b/recipes/recipes/emscripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch @@ -0,0 +1,37 @@ +From a8bdb50a29062ee70c8667e4fd94dde47917f8fa Mon Sep 17 00:00:00 2001 +From: Hood Chatham +Date: Fri, 19 May 2023 12:19:00 -0700 +Subject: [PATCH] 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 d96e6b425..7f63b5c5e 100644 +--- a/src/library_dylink.js ++++ b/src/library_dylink.js +@@ -727,6 +727,9 @@ var LibraryDylink = { + var resolved; + stubs[prop] = function() { + if (!resolved) resolved = resolveSymbol(prop); ++ if (!resolved) { ++ throw new Error(`Dynamic linking error: cannot resolve symbol ${prop}`); ++ } + return resolved.apply(null, arguments); + }; + } +-- +2.25.1 + diff --git a/recipes/recipes/emscripten_emscripten-wasm32/patches/LICENSE b/recipes/recipes/emscripten_emscripten-wasm32/patches/LICENSE new file mode 100644 index 000000000..a612ad981 --- /dev/null +++ b/recipes/recipes/emscripten_emscripten-wasm32/patches/LICENSE @@ -0,0 +1,373 @@ +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/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml index 775f8be4e..808b0cf45 100644 --- a/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml +++ b/recipes/recipes/emscripten_emscripten-wasm32/recipe.yaml @@ -3,7 +3,7 @@ context: version: 3.1.45 build: - number: 27 + number: 28 outputs: - package: From 2837076cb9f620532f23f510651cd95ba21835b1 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 17 Jun 2024 10:42:02 +0200 Subject: [PATCH 17/20] all together --- recipes/recipes_emscripten/pyjs/recipe.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index db65a2458..c52560d9f 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -9,7 +9,7 @@ source: url: https://github.com/emscripten-forge/pyjs/archive/refs/tags/${{ version }}.tar.gz sha256: 8633dfd8b5bf9403e6b9c02c582557dcc49226034689032939b547c7dc431000 build: - number: 0 + number: 6 requirements: build: From 8730fd96226cec32ae820fea4dc683836f8f0862 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 17 Jun 2024 10:46:34 +0200 Subject: [PATCH 18/20] recompile pyjs --- .github/workflows/build_recipes.yaml | 2 -- .github/workflows/on_compiler_changes.yaml | 38 ++++++++++++++++++++++ .github/workflows/run_with_pixi.yaml | 2 -- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/on_compiler_changes.yaml diff --git a/.github/workflows/build_recipes.yaml b/.github/workflows/build_recipes.yaml index 498ef30f8..c00d2af68 100644 --- a/.github/workflows/build_recipes.yaml +++ b/.github/workflows/build_recipes.yaml @@ -18,8 +18,6 @@ jobs: GITHUB_OWNER: "emscripten-forge" strategy: fail-fast: false - matrix: - emsdk_ver: ["3.1.45"] steps: ################################################################ diff --git a/.github/workflows/on_compiler_changes.yaml b/.github/workflows/on_compiler_changes.yaml new file mode 100644 index 000000000..030570604 --- /dev/null +++ b/.github/workflows/on_compiler_changes.yaml @@ -0,0 +1,38 @@ +name: compile pyjs +on: + push: + branches: + - 'main' + paths: + - 'recipes/recipes/emscripten_emscripten-wasm32' + pull_request: + paths: + - 'recipes/recipes/emscripten_emscripten-wasm32' +jobs: + + build_simple_with_pixi: + runs-on: ubuntu-latest + env: + TARGET_PLATFORM: emscripten-wasm32 + GITHUB_OWNER: "emscripten-forge" + strategy: + fail-fast: false + + steps: + ################################################################ + # SETUP + ################################################################ + - name: Checkout repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + ################################################################ + # CONFIG + ################################################################ + - uses: prefix-dev/setup-pixi@v0.6.0 + with: + pixi-version: v0.20.1 + - run: | + pixi run setup + pixi run build-emscripten-wasm32-pkg recipes/recipes_emscripten/pyjs \ No newline at end of file diff --git a/.github/workflows/run_with_pixi.yaml b/.github/workflows/run_with_pixi.yaml index 03e3c5625..6015118ce 100644 --- a/.github/workflows/run_with_pixi.yaml +++ b/.github/workflows/run_with_pixi.yaml @@ -19,8 +19,6 @@ jobs: GITHUB_OWNER: "emscripten-forge" strategy: fail-fast: false - matrix: - emsdk_ver: ["3.1.45"] steps: ################################################################ From 407fe811950a341f0f379645a36003217e07404b Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 17 Jun 2024 10:48:00 +0200 Subject: [PATCH 19/20] require numpy --- recipes/recipes_emscripten/pyjs/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/recipes_emscripten/pyjs/recipe.yaml b/recipes/recipes_emscripten/pyjs/recipe.yaml index ad75e17bd..c52560d9f 100644 --- a/recipes/recipes_emscripten/pyjs/recipe.yaml +++ b/recipes/recipes_emscripten/pyjs/recipe.yaml @@ -63,6 +63,7 @@ tests: - microsoft::playwright run: - pytest + - numpy files: source: - tests/**/* From e50897c5a1b21a3f17b3c017d18827904a96a172 Mon Sep 17 00:00:00 2001 From: DerThorsten Date: Mon, 17 Jun 2024 10:52:42 +0200 Subject: [PATCH 20/20] update change trigger --- .github/workflows/on_compiler_changes.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on_compiler_changes.yaml b/.github/workflows/on_compiler_changes.yaml index 030570604..e8315ad13 100644 --- a/.github/workflows/on_compiler_changes.yaml +++ b/.github/workflows/on_compiler_changes.yaml @@ -4,10 +4,10 @@ on: branches: - 'main' paths: - - 'recipes/recipes/emscripten_emscripten-wasm32' + - 'recipes/recipes/emscripten_emscripten-wasm3/**' pull_request: paths: - - 'recipes/recipes/emscripten_emscripten-wasm32' + - 'recipes/recipes/emscripten_emscripten-wasm32/**' jobs: build_simple_with_pixi: