Merge branch 'main' into undo

Author: kr-2003

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)

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

@@ -138,7 +138,7 @@ http://xeus-cpp.readthedocs.io
 
 | `xeus-cpp` | `xeus-zmq`      | `CppInterOp` | `pugixml` | `cpp-argparse`| `nlohmann_json` |
 |------------|-----------------|--------------|-----------|---------------|-----------------|
-|  main      |  >=3.0.0,<4.0.0 | >=1.5.0      | ~1.8.1    | >=3.0,<4.0    | >=3.11.3,<4.0   |
+|  main      |  >=3.0.0,<4.0.0 | >=1.7.0      | ~1.8.1    | >=3.0,<4.0    | >=3.12.0,<4.0   |
 |  0.6.0     |  >=3.0.0,<4.0.0 | >=1.5.0      | ~1.8.1    | <3.1          | >=3.11.3,<4.0   |
 |  0.5.0     |  >=3.0.0,<4.0.0 | >=1.3.0      | ~1.8.1    | <3.1          | >=3.11.3,<4.0   |
 

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
 

notebooks/smallpt.ipynb

@@ -38138,8 +38138,8 @@
     </member>
     <member kind="function">
       <type>T</type>
-      <name>select_on_container_copy_contruction</name>
-      <anchorfile>cpp/memory/polymorphic_allocator/select_on_container_copy_contruction</anchorfile>
+      <name>select_on_container_copy_construction</name>
+      <anchorfile>cpp/memory/polymorphic_allocator/select_on_container_copy_construction</anchorfile>
       <anchor></anchor>
       <arglist>(T... args)</arglist>
     </member>

share/xeus-cpp/tagfiles/cppreference-doxygen-web.tag

@@ -35,10 +35,7 @@ def test_codecomplete(self) -> None:
         reply = self.get_non_kernel_info_reply(timeout=1)
         assert reply is not None
         self.assertEqual(reply["msg_type"], "complete_reply")
-        if platform.system() == 'Windows':
-            self.assertEqual(str(reply["content"]["matches"]), "['fabs', 'fabsf', 'fabsl', 'float', 'foo']")
-        else:
-            self.assertEqual(str(reply["content"]["matches"]), "['float', 'foo']")
+        self.assertEqual(reply["content"]["matches"], ['float', 'foo'])
         self.assertEqual(reply["content"]["status"], "ok")
 
     # Continuation