Merge branch 'main' into Remove-lower-bound-on-cppargparse

Author: mcbarton

.github/workflows/clang-tidy-review-post.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Post review comments
         id: post-review
-        uses: ZedThree/clang-tidy-review/post@v0.20.1
+        uses: ZedThree/clang-tidy-review/post@v0.21.0
         with:
           max_comments: 10
 

.github/workflows/clang-tidy-review.yml

@@ -30,7 +30,7 @@ jobs:
           version: "17.0.6"
 
       - name: Run clang-tidy
-        uses: ZedThree/clang-tidy-review@v0.20.1
+        uses: ZedThree/clang-tidy-review@v0.21.0
         id: review
         with:
           build_dir: build
@@ -53,4 +53,4 @@ jobs:
             cmake . -B build -DCMAKE_C_COMPILER="$GITHUB_WORKSPACE/llvm/bin/clang" -DCMAKE_CXX_COMPILER="$GITHUB_WORKSPACE/llvm/bin/clang++" -DCMAKE_EXPORT_COMPILE_COMMANDS=On
             
       - name: Upload artifacts
-        uses: ZedThree/clang-tidy-review/upload@v0.20.1
+        uses: ZedThree/clang-tidy-review/upload@v0.21.0

.github/workflows/deploy-github-page.yml

@@ -61,6 +61,7 @@ jobs:
             -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON               \
             -DCMAKE_FIND_ROOT_PATH=$PREFIX                    \
             -DSYSROOT_PATH=$SYSROOT_PATH                      \
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON            \
             ..
           emmake make -j ${{ env.ncpus }} install
 
@@ -74,6 +75,7 @@ jobs:
               --XeusAddon.prefix=${{ env.PREFIX }} \
               --contents README.md \
               --contents notebooks/xeus-cpp-lite-demo.ipynb \
+              --contents notebooks/smallpt.ipynb \
               --contents notebooks/images/marie.png \
               --contents notebooks/audio/audio.wav \
               --output-dir dist

.github/workflows/main.yml

@@ -244,6 +244,7 @@ jobs:
             -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON               \
             -DCMAKE_FIND_ROOT_PATH=$PREFIX                    \
             -DSYSROOT_PATH=$SYSROOT_PATH                      \
+            -DCMAKE_COMPILE_WARNING_AS_ERROR=ON            \
             ..
           emmake make -j ${{ env.ncpus }} install
 

CMakeLists.txt

@@ -91,7 +91,7 @@ endif()
 
 set(xeus_REQUIRED_VERSION 5.0.0)
 set(xeus_zmq_REQUIRED_VERSION 3.0.0)
-set(CppInterOp_REQUIRED_VERSION 1.5.0)
+set(CppInterOp_REQUIRED_VERSION 1.7.0)
 
 if (NOT TARGET xeus AND NOT TARGET xeus-static)
     find_package(xeus ${xeus_REQUIRED_VERSION} REQUIRED)
@@ -169,17 +169,10 @@ endfunction()
 
 message("Configure kernels: ...")
 if(EMSCRIPTEN)
-    # TODO: Currently jupyterlite-xeus and xeus-lite do not provide
-    # methods to fetch information from the arguments present in the
-    # generated emscripten kernel.
-    # The following needs to be done here :
-    # 1) We need to configure the kernel properly
-    #    Check issue https://github.com/compiler-research/xeus-cpp/issues/185.
-    # 2) Once the above is done we need to add support in jupyterlite-xeus & xeus-lite
-    #    to be able to deal with arguments present in kernel.json
-    # 3) Finally we should fetch the C++ version from the kernel.json file and
-    #    be able to pass it to our wasm interpreter rather than forcing a version.
+    set(XEUS_CPP_RESOURCE_DIR "/lib/clang/${CPPINTEROP_LLVM_VERSION_MAJOR}")
+    configure_wasm_kernel("/share/jupyter/kernels/xcpp17/")
     configure_wasm_kernel("/share/jupyter/kernels/xcpp20/")
+    configure_wasm_kernel("/share/jupyter/kernels/xcpp23/")
 else()
     configure_native_kernel("/share/jupyter/kernels/xcpp17/")
     configure_native_kernel("/share/jupyter/kernels/xcpp20/")
@@ -443,21 +436,13 @@ if(EMSCRIPTEN)
     xeus_wasm_compile_options(xcpp)
     xeus_wasm_link_options(xcpp "web,worker")
     target_link_options(xcpp
+        PUBLIC "SHELL: -s USE_SDL=2"
         PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
+        PUBLIC "SHELL: --preload-file ${CMAKE_INSTALL_PREFIX}${XEUS_CPP_RESOURCE_DIR}@${XEUS_CPP_RESOURCE_DIR}"
         PUBLIC "SHELL: --preload-file ${XEUS_CPP_DATA_DIR}@/share/xeus-cpp"
         PUBLIC "SHELL: --preload-file ${XEUS_CPP_CONF_DIR}@/etc/xeus-cpp"
         PUBLIC "SHELL: --post-js ${CMAKE_CURRENT_SOURCE_DIR}/wasm_patches/post.js"
     )
-    # TODO: Emscripten supports preloading files just once before it generates
-    # the xcpp.data file (containing the binary representation of the file(s) we
-    # want to include in our application).
-    # Hence although we are adding support for Standard Headers, Libraries etc
-    # through emscripten's sysroot for now, we need to do the following:
-    # 1) Enable CppInterOp to provide us with a resource dir.
-    # 2) If the above cannot be done, we can use the resource dir provided
-    #    by llvm on emscripten-forge but would involve adding a dependency.
-    # 3) Shift the resource dir and the sysroot to a common location.
-    # 4) Preload everything required together.
 endif()
 # Tests
 # =====

CONTRIBUTING.md

@@ -18,7 +18,7 @@ minutes of past meetings can be found on our
 ## Setting up a development environment
 
 First, you need to fork the project. After you have done this clone your forked repo. You can do this by 
-executing the folowing
+executing the following
 
 ```bash
 git clone https://github.com/<your-github-username>/xeus-cpp.git
@@ -35,7 +35,7 @@ micromamba create -f environment-dev.yml -y
 micromamba activate xeus-cpp
 ```
 
-You are now in a position to install xeus-cpp into this envirnoment. You can do this by executing
+You are now in a position to install xeus-cpp into this environment. You can do this by executing
 
 ```bash
 mkdir build
@@ -61,7 +61,7 @@ pytest -sv test_xcpp_kernel.py
 ## Setting up a development environment (wasm instructions)
 
 First, you need to fork the project. After you have done this clone your forked repo. You can do this by 
-executing the folowing
+executing the following
 
 ```bash
 git clone https://github.com/<your-github-username>/xeus-cpp.git

README.md

@@ -136,8 +136,6 @@ http://xeus-cpp.readthedocs.io
 - [argparse](https://github.com/p-ranav/argparse)
 - [CppInterOp](https://github.com/compiler-research/CppInterOp)
 
-## Contributing
-
 See [CONTRIBUTING.md](./CONTRIBUTING.md) to know how to contribute and set up a
 development environment.
 

docs/environment.yml

@@ -5,5 +5,6 @@ channels:
 
 dependencies:
   - breathe
+  - graphviz
   - pip:
-    - sphinx_rtd_theme
+    - sphinx_rtd_theme

docs/source/InstallationAndUsage.rst

@@ -100,7 +100,7 @@ Once the Jupyter Lite site has built you can test the website locally by executi
 Installing from conda-forge
 ===========================
 
-If you have conda installed then you can install xeus-cpp using the follwing command
+If you have conda installed then you can install xeus-cpp using the following command
 
 .. code-block:: bash
 

docs/source/index.rst

@@ -12,7 +12,11 @@ Introduction
 ------------
 
 ``xeus-cpp`` is a Jupyter kernel for cpp based on the native implementation of
-the Jupyter protocol xeus_.
+the Jupyter protocol xeus_. Try a Jupyter Lite demo of xeus-cpp by clicking
+
+.. image:: https://jupyterlite.rtfd.io/en/latest/_static/badge.svg
+   :target: https://compiler-research.github.io/xeus-cpp/lab/index.html
+   :alt: lite-badge
 
 Licensing
 ---------
@@ -40,4 +44,4 @@ The Xeus-Cpp is a Jupyter kernel for the C++ programming language
    FAQ
    reference
 
-.. _xeus: https://github.com/jupyter-xeus/xeus
+.. _xeus: https://github.com/jupyter-xeus/xeus