Add core packages (#6)

Author: ryanking13

.github/workflows/build.yml

@@ -14,32 +14,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+
+      - uses: conda-incubator/setup-miniconda@v2
         with:
-          python-version: "3.11"
+          activate-environment: pyodide-env
+          environment-file: environment.yml
+          channels: conda-forge
+
       - name: Install latest pyodide-build and build dependencies
+        shell: bash -l {0}
         run : |
-          pip install git+https://github.com/pyodide/pyodide.git@main#subdirectory=pyodide-build
-          pip install setuptools --upgrade
-
+          which python
+          python -m pip install git+https://github.com/pyodide/pyodide.git@main#subdirectory=pyodide-build
           pyodide xbuildenv install --download --url http://pyodide-cache.s3-website-us-east-1.amazonaws.com/xbuildenv/dev/xbuildenv.tar.bz2
 
-          sudo apt update
-          sudo apt install gfortran f2c
-
       - name: Check emscripten version
+        shell: bash -l {0}
         run: |
           echo EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version) >> $GITHUB_ENV
+
       - uses: mymindstorm/setup-emsdk@v11
         with:
           version: ${{ env.EMSCRIPTEN_VERSION }}
 
       - name: Calculate recipes to build (pull_request)
         if: github.event_name == 'pull_request'
         id: calculate_recipes_pr
+        shell: bash -l {0}
         run: |
-          CHANGED_RECIPES=$(python ./tools/calc_diff.py \
-            --base ${{ github.base_ref }} \
+          export CHANGED_RECIPES=$(python ./tools/calc_diff.py \
+            --base origin/${{ github.base_ref }} \
             --target ${{ github.head_ref }})
 
           # If there are no changed recipes, we build only core packages sets
@@ -50,11 +54,13 @@ jobs:
           fi
 
       - name: Build recipes (full)
+        shell: bash -l {0}
         if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.head_commit.message, '[full build]') }}
         run: |
           pyodide build-recipes "*" --install --install-dir=./repodata
 
       - name: Build recipes (changed only)
+        shell: bash -l {0}
         if: github.event_name == 'pull_request' && !contains(github.event.head_commit.message, '[full build]')
         run: |
           pyodide build-recipes ${{ steps.calculate_recipes_pr.outputs.recipes }} --install --install-dir=./repodata
@@ -89,11 +95,14 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v4
+      - uses: conda-incubator/setup-miniconda@v2
         with:
-          python-version: "3.11"
+          activate-environment: pyodide-env
+          environment-file: environment.yml
+          channels: conda-forge
 
       - name: Download latest Pyodide
+        shell: bash -l {0}
         run: |
           wget http://pyodide-cache.s3-website-us-east-1.amazonaws.com/xbuildenv/dev/pyodide-core.tar.bz2
           tar -xvf pyodide-core.tar.bz2
@@ -105,11 +114,6 @@ jobs:
           browser: ${{ matrix.test-config.runtime }}
           browser-version: ${{ matrix.test-config.runtime-version }}
 
-      - name: Install requirements
-        shell: bash -l {0}
-        run: |
-          python3 -m pip install pytest pytest-pyodide pytest-httpserver
-
       - name: Download build artifact
         uses: actions/download-artifact@v2
         with:
@@ -121,6 +125,7 @@ jobs:
           cp ./repodata/* ./dist/
 
       - name: Run tests
+        shell: bash -l {0}
         run: |
           # FIXME: skip webworker tests
           pytest -v \

environment.yml

@@ -0,0 +1,23 @@
+name: pyodide-env
+channels:
+  - conda-forge
+dependencies:
+  - python=3.11
+  - nodejs
+  - ccache
+  - f2c
+  - pkg-config
+  - swig
+  - make
+  - cmake
+  - pkg-config
+  - texinfo
+  - autoconf
+  - automake
+  - libtool
+  - wget
+  - setuptools
+  - pip:
+    - pytest
+    - pytest-pyodide
+    - pytest-httpserver

packages/Jinja2/meta.yaml

@@ -0,0 +1,19 @@
+package:
+  name: Jinja2
+  version: 3.1.2
+  tag:
+    - core
+    - min-scipy-stack
+  top-level:
+    - jinja2
+requirements:
+  run:
+    - MarkupSafe
+source:
+  sha256: 6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61
+  url: https://files.pythonhosted.org/packages/bc/c3/f068337a370801f372f2f8f6bad74a5c140f6fda3d9de154052708dd3c65/Jinja2-3.1.2-py3-none-any.whl
+about:
+  home: https://palletsprojects.com/p/jinja/
+  PyPI: https://pypi.org/project/Jinja2
+  summary: A very fast and expressive template engine.
+  license: BSD-3-Clause

packages/Jinja2/test_jinja2.py

@@ -0,0 +1,10 @@
+from pytest_pyodide import run_in_pyodide
+
+
+@run_in_pyodide(packages=["Jinja2"])
+def test_jinja2(selenium):
+    import jinja2
+
+    template = jinja2.Template("Hello {{ name }}!")
+    content = template.render(name="Zach")
+    assert content == "Hello Zach!"

packages/MarkupSafe/meta.yaml

@@ -0,0 +1,13 @@
+package:
+  name: MarkupSafe
+  version: 2.1.3
+  top-level:
+    - markupsafe
+source:
+  sha256: af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad
+  url: https://files.pythonhosted.org/packages/6d/7c/59a3248f411813f8ccba92a55feaac4bf360d29e2ff05ee7d8e1ef2d7dbf/MarkupSafe-2.1.3.tar.gz
+about:
+  home: https://palletsprojects.com/p/markupsafe/
+  PyPI: https://pypi.org/project/MarkupSafe
+  summary: Safely add untrusted strings to HTML/XML markup.
+  license: BSD-3-Clause

packages/atomicwrites/meta.yaml

@@ -0,0 +1,13 @@
+package:
+  name: atomicwrites
+  version: 1.4.1
+  top-level:
+    - atomicwrites
+source:
+  sha256: 81b2c9071a49367a7f770170e5eec8cb66567cfbbc8c73d20ce5ca4a8d71cf11
+  url: https://files.pythonhosted.org/packages/87/c6/53da25344e3e3a9c01095a89f16dbcda021c609ddb42dd6d7c0528236fb2/atomicwrites-1.4.1.tar.gz
+about:
+  home: https://github.com/untitaker/python-atomicwrites
+  PyPI: https://pypi.org/project/atomicwrites
+  summary: Atomic file writes.
+  license: MIT

packages/attrs/meta.yaml

@@ -0,0 +1,17 @@
+package:
+  name: attrs
+  version: 23.1.0
+  top-level:
+    - attr
+    - attrs
+source:
+  sha256: 1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04
+  url: https://files.pythonhosted.org/packages/f0/eb/fcb708c7bf5056045e9e98f62b93bd7467eb718b0202e7698eb11d66416c/attrs-23.1.0-py3-none-any.whl
+requirements:
+  run:
+    - six
+about:
+  home: https://www.attrs.org/
+  PyPI: https://pypi.org/project/attrs
+  summary: Classes Without Boilerplate
+  license: MIT

packages/cpp-exceptions-test/meta.yaml

@@ -0,0 +1,16 @@
+package:
+  name: cpp-exceptions-test
+  version: "0.1"
+  tag:
+    - core
+    - pyodide.test
+    - library
+source:
+  path: src
+build:
+  type: shared_library
+  script: |
+    em++ -c throw.cpp -o throw.o ${SIDE_MODULE_CFLAGS} -fexceptions -I${PYTHONINCLUDE} -flto -fno-lto
+    em++ -c catch.cpp -o catch.o ${SIDE_MODULE_CFLAGS} -fexceptions -I${PYTHONINCLUDE} -flto -fno-lto
+    em++ throw.o ${SIDE_MODULE_LDFLAGS} -o ${DISTDIR}/cpp-exceptions-test-throw.so -fexceptions
+    em++ catch.o ${SIDE_MODULE_LDFLAGS} -o ${DISTDIR}/cpp-exceptions-test-catch.so -fexceptions

packages/cpp-exceptions-test/src/catch.cpp

@@ -0,0 +1,64 @@
+#include <exception>
+using namespace std;
+#include <Python.h>
+#include <setjmp.h>
+#include <stdexcept>
+#include <stdio.h>
+
+extern "C" char*
+throw_exc(int x);
+
+extern "C" int
+call_pyobj(PyObject* x);
+
+extern "C" char*
+catch_exc(int x)
+{
+  char* msg;
+  try {
+    char* res = throw_exc(x);
+    asprintf(&msg, "result was: %s", res);
+  } catch (int param) {
+    asprintf(&msg, "caught int %d", param);
+  } catch (char param) {
+    asprintf(&msg, "caught char %d", param);
+  } catch (runtime_error& e) {
+    asprintf(&msg, "caught runtime_error %s", e.what());
+  } catch (...) {
+    asprintf(&msg, "caught ????");
+  }
+  return msg;
+}
+
+extern "C" char*
+catch_call_pyobj(PyObject* x)
+{
+  char* msg;
+  try {
+    int res = call_pyobj(x);
+    asprintf(&msg, "result was: %d", res);
+  } catch (int param) {
+    asprintf(&msg, "caught int %d", param);
+  } catch (char param) {
+    asprintf(&msg, "caught char %d", param);
+  } catch (runtime_error& e) {
+    asprintf(&msg, "caught runtime_error %s", e.what());
+  } catch (...) {
+    asprintf(&msg, "caught ????");
+  }
+  return msg;
+}
+
+jmp_buf my_jump_buffer;
+void
+longjmp_func(int status);
+
+extern "C" int
+set_jmp_func()
+{
+  int status = setjmp(my_jump_buffer);
+  if (status == 0) {
+    longjmp_func(4);
+  }
+  return status;
+}

packages/cpp-exceptions-test/src/throw.cpp

@@ -0,0 +1,45 @@
+#include <Python.h>
+#include <exception>
+#include <stdexcept>
+
+#include <setjmp.h>
+#include <stdnoreturn.h>
+
+jmp_buf my_jump_buffer;
+using namespace std;
+
+class myexception : public exception
+{
+  virtual const char* what() const throw() { return "My exception happened"; }
+} myex;
+
+extern "C" char*
+throw_exc(int x)
+{
+  if (x == 1) {
+    throw 1000;
+  } else if (x == 2) {
+    throw 'c';
+  } else if (x == 3) {
+    throw runtime_error("abc");
+  } else if (x == 4) {
+    throw myex;
+  } else {
+    throw "abc";
+  }
+}
+
+extern "C" int
+call_pyobj(PyObject* x)
+{
+  PyObject* result = PyObject_CallNoArgs(x);
+  int r = PyLong_AsLong(result);
+  Py_DECREF(result);
+  return r;
+}
+
+noreturn void
+longjmp_func(int status)
+{
+  longjmp(my_jump_buffer, status + 1); // will return status+1 out of setjmp
+}