Merge branch 'main' into bump-zarr_2.11.3_to_2.12.0

.github/workflows/run_with_pixi.yaml

@@ -3,7 +3,13 @@ on:
   push:
     branches:
       - 'main'
+    paths-ignore:
+      - 'recipes/**'
+      - 'docs/**'
   pull_request:
+    paths-ignore:
+      - 'recipes/**'
+      - 'docs/**'
 jobs:
 
   build_simple_with_pixi:

conda_build_config.yaml

@@ -30,7 +30,7 @@ cxx_compiler:
   - if: osx
     then:
       - clangxx
-      
+
 cxx_compiler_version:
   - if: emscripten
     then:
@@ -42,8 +42,8 @@ cxx_compiler_version:
     then:
       - 11
 
-cuda_compiler:                 
-  - undefined                  
+cuda_compiler:
+  - undefined
 cuda_compiler_version:
   - None
 cudnn:
@@ -53,7 +53,7 @@ _libgcc_mutex:
   - 0.1 conda_forge
 
 target_goexe:
-  -                            
+  -
 target_gobin:
   - '${PREFIX}/bin/'
 
@@ -202,7 +202,7 @@ pin_run_as_build:
   xz:
     max_pin: x.x
   zeromq:
-    max_pin: x.x 
+    max_pin: x.x
 
 # Pinning packages
 
@@ -220,7 +220,7 @@ liblapacke:
 blas_impl:
   - openblas
   - mkl
-  - blis         
+  - blis
 
 abseil_cpp:
   - '20210324.2'
@@ -563,7 +563,7 @@ pybind11_abi:
   - 4
 
 pip:
-  - '22.0.4'
+  - '24.0.*'
 python:
   - 3.11.* *_cpython
 #   # part of a zip_keys: python, python_impl, numpy

docs/development/adding_packages.md

@@ -46,6 +46,60 @@ requirements:
 * [regex](https://github.com/emscripten-forge/recipes/tree/main/recipes/recipes_emscripten/regex)
 
 
+### menson
+
+For a meson package, the following requirements are usually needed.
+```yaml
+requirements:
+  build:
+  - ${{ compiler('cxx') }}
+  - cross-python_${{target_platform}}
+  - meson-python
+  - pip >=24
+  host:
+  - python
+```
+Furthermore a `emscripten.meson.cross` file is necessary to set the correct compiler and flags for the cross compilation.
+
+```toml
+# binaries section is at the end as may want to append python binary.
+
+[properties]
+needs_exe_wrapper = true
+skip_sanity_check = true
+longdouble_format = 'IEEE_QUAD_LE' # for numpy
+
+[host_machine]
+system = 'emscripten'
+cpu_family = 'wasm32'
+cpu = 'wasm'
+endian = 'little'
+
+[binaries]
+exe_wrapper = 'node'
+pkgconfig = 'pkg-config'
+
+```
+
+in the build script we append the python binary to the cross file and
+pass the cross file to the pip command.
+
+```bash
+#!/bin/bash
+
+cp $RECIPE_DIR/emscripten.meson.cross $SRC_DIR
+echo "python = '${PYTHON}'" >> $SRC_DIR/emscripten.meson.cross
+
+${PYTHON} -m pip install . -vvv --no-deps --no-build-isolation \
+    -Csetup-args="--cross-file=$SRC_DIR/emscripten.meson.cross"
+```
+
+
+**Example recipes**:
+
+* [contourpy](https://github.com/emscripten-forge/recipes/tree/main/recipes/recipes_emscripten/contourpy)
+* [numpy](https://github.com/emscripten-forge/recipes/tree/main/recipes/recipes_emscripten/numpy)
+
 ### rust 
 Building rust package with PyO3 / maturin works usually out of the box.
 

docs/development/conda_build_config.md

@@ -0,0 +1,70 @@
+
+# Conda build config
+
+Simmilar to conda-forge we globally pin packages.
+This is essentialy a list of packages and versions like 
+```yaml
+# ...
+numpy:
+  - 1.25.2
+occt:
+  - '7.5'
+openblas:
+  - 0.3.*
+openexr:
+  - 2.5
+openjpeg:
+  - '2.4'
+openmpi:
+  - 4
+openssl:
+  - 1.1.1
+openturns:
+  - '1.18'
+orc:
+  - 1.7.2
+# ...
+```
+
+This list is used to pin the versions of the dependencies in the `recipe.yaml` of recipes.
+
+Therefore instead of writing 
+
+```yaml
+requirements:
+  host:
+    - numpy 1.25.2
+  run:
+    - numpy 1.25.2
+```
+
+we can write
+
+```yaml
+requirements:
+  host:
+    - numpy
+  run:
+    - numpy
+
+```
+Furthermore this build-config contains the information which compiler to use for which platform.
+While conda forge can be found [here](https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml),
+we **need** to maintain our on [conda-build-config](https://github.com/emscripten-forge/recipes/blob/main/conda_build_config.yaml). In particular we need to setup the emscripten compiler.
+
+!!! note
+    The conda-build-config of emscripten-forge uses the [rattler-recipies format](https://github.com/prefix-dev/rattler-build?tab=readme-ov-file#the-recipe-format)
+
+
+```yaml
+cxx_compiler:
+  - if: emscripten
+    then:
+      - emscripten
+  - if: linux
+    then:
+      - gxx
+  - if: osx
+    then:
+      - clangxx
+```

docs/development/troubleshooting.md

@@ -0,0 +1,22 @@
+# Troubleshooting
+
+
+Compiling for emscripten-wasm32 is a complex task. This section provides some tips and tricks to help you troubleshoot common issues.
+
+## Buildtime errors
+
+This section is still empty, feel free to contribute by opening a pull request.
+
+## Runtime errors
+
+### `PyLong_FromLongLong`: imported function does not match the expected type
+
+When facing an error at runtime while importing a shared-library/ python-package like the following:
+```
+ LinkError: WebAssembly.instantiate(): 
+    function="PyLong_FromLongLong":
+    imported function does not match the expected type
+```
+or similar error message containing the woring `*LongLong`  or similar, it is likely 
+the linker flag `-s WASM_BIGINT` is missing.
+

docs/index.md

@@ -6,19 +6,25 @@ Conda-forge does not (yet) support the `emscripten-wasm32` platform. `emscripten
 The recipe repository not only stores the recipe, but also builds and upload the recipe 
 with github actions to the `emscripten-forge` channel on [quetz](https://beta.mamba.pm/channels/emscripten-forge)
 
+## 
 
-# Table of Contents
-**Development**:
+### Development
 
   * [Adding_packages](development/adding_packages)
   * [Recipe format](development/recipe_format)
   * [Local Builds](development/local_builds)
+  * [Conda build config](development/conda_build_config)
+  * [Troubleshooting](development/troubleshooting)
 
-**Usage**:
+### Usage
 
   * [Installing packages](usage/installing_packages)
   * [Jupyterlite](usage/jupyterlite)
+  * [Package server](usage/package_server)
 
-**Project**:
+### Project 
 
+  * [Blog](blog)
   * [Related Projects](project/related_projects)
+  * [FAQ](project/faq)
+  * [Credits](project/credits)

docs/project/credits.md

@@ -0,0 +1,18 @@
+# Credids
+
+## Pyodide
+This project is heavily inspired by the [pyodide](https://pyodide.org/en/stable/) project.
+Many recipes, build scripts, and patches are heavily inspired by the pyodide project.
+Many thanks to the pyodide team for their work.
+
+## Conda Forge
+
+Many thanks to the [conda-forge](https://conda-forge.org/) team for their work.
+Many recipes, build scripts, and patches are heavily inspired by the conda-forge project.
+
+
+## Contributors
+
+This project has been started by [Thorsten Beier](https://github.com/derthorsten/) and [Wolf Vollprecht](https://github.com/wolfv).
+Since then many contributors have joined the project.
+Many thanks to [all the contributors](https://github.com/emscripten-forge/recipes/graphs/contributors) of the emscripten-forge project.

docs/project/faq.md

@@ -0,0 +1,11 @@
+# FAQ
+
+This section is relatively empty, feel free to contribute by opening a pull request.
+
+## What is the difference between emscripten-forge and pyodide?
+
+Pyodide is a full python distribution for `emscripten-wasm32` running in the browser.
+Therefore all packages are either python packages or shared libraries needed by python packages.
+Emscripten-forge on the other hand is a conda channel providing packages for the `emscripten-wasm32` platform.
+This means there is a great overlap in the provided python packages, but emscripten-forge also  provided non-python packages for the `emscripten-wasm32` platform.
+Furthermore pyodide lives in the `pip` ecosystem, while emscripten-forge lives in the `conda/mamamba/rattler` ecosystem.

docs/hosting.md → docs/usage/pacakge_server.md

@@ -1,4 +1,4 @@
-# Quetz Server
+# Packagve Server
 
 Emscripten forge packages are hosted as 
 as a the [emscripten-forge](https://beta.mamba.pm/channels/emscripten-forge) channel on a [Quetz](https://quetz.io/) server. 

emci/bot/bump_recipes_versions.py

@@ -211,7 +211,7 @@ def user_ctx(user, email, bypass=False):
         subprocess.check_output(['git', 'config', '--unset', 'user.email'])
 
 
-def bump_recipe_versions(recipe_dir, use_bot=True, pr_limit=5):
+def bump_recipe_versions(recipe_dir, use_bot=True, pr_limit=10):
 
    # empty context manager
     @contextlib.contextmanager

recipes/recipes_emscripten/contourpy/build.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-# Removing this warning will not be needed after the next pybind11 release
-export CPPFLAGS="-Wno-deprecated-literal-operator"
+cp $RECIPE_DIR/emscripten.meson.cross $SRC_DIR
+echo "python = '${PYTHON}'" >> $SRC_DIR/emscripten.meson.cross
 
-${PYTHON} -m pip install . -vvv --no-deps
+${PYTHON} -m pip install . -vvv --no-deps --no-build-isolation \
+    -Csetup-args="--cross-file=$SRC_DIR/emscripten.meson.cross"

recipes/recipes_emscripten/contourpy/emscripten.meson.cross

@@ -0,0 +1,16 @@
+# binaries section is at the end as may want to append python binary.
+
+[properties]
+needs_exe_wrapper = true
+skip_sanity_check = true
+longdouble_format = 'IEEE_QUAD_LE' # for numpy
+
+[host_machine]
+system = 'emscripten'
+cpu_family = 'wasm32'
+cpu = 'wasm'
+endian = 'little'
+
+[binaries]
+exe_wrapper = 'node'
+pkgconfig = 'pkg-config'

recipes/recipes_emscripten/contourpy/recipe.yaml

@@ -1,24 +1,24 @@
 context:
   name: contourpy
-  version: 1.0.7
+  version: 1.2.1
 
 package:
   name: ${{ name|lower }}
   version: ${{ version }}
 
 source:
-- url: 
-    https://files.pythonhosted.org/packages/b4/9b/6edb9d3e334a70a212f66a844188fcb57ddbd528cbc3b1fe7abfc317ddd7/contourpy-${{
-    version }}.tar.gz
-  sha256: d8165a088d31798b59e91117d1f5fc3df8168d8b48c4acc10fc0df0d0bdbcc5e
+- url: https://pypi.io/packages/source/c/contourpy/contourpy-${{ version }}.tar.gz
+  sha256: 4d8908b3bee1c889e547867ca4cdc54e5ab6be6d3e078556814a22457f49423c
 
 build:
   number: 0
 
 requirements:
   build:
   - ${{ compiler('cxx') }}
-  - cross-python_emscripten-wasm32
+  - cross-python_${{target_platform}}
+  - meson-python
+  - pip >=24
   - pybind11
   host:
   - python

recipes/recipes_emscripten/contourpy/test_contourpy.py

@@ -15,12 +15,12 @@ def test_import():
         ("serial", "SeparateCode"),
         ("serial", "ChunkCombinedCode"),
         ("serial", "ChunkCombinedOffset"),
-        #("serial", "ChunkCombinedNan"),  # Needs contourpy >= 1.2.0
+        ("serial", "ChunkCombinedNan"),
         ("threaded", "Separate"),
         ("threaded", "SeparateCode"),
         ("threaded", "ChunkCombinedCode"),
         ("threaded", "ChunkCombinedOffset"),
-        #("threaded", "ChunkCombinedNan"),  # Needs contourpy >= 1.2.0
+        ("threaded", "ChunkCombinedNan"),
     ],
 )
 def test_line(name, line_type):