From 08a01c8453187e08f26cecfc6671d154183b4215 Mon Sep 17 00:00:00 2001 From: Anutosh Bhat Date: Tue, 17 Feb 2026 15:33:58 +0530 Subject: [PATCH] Revert "Revert cppinterop update to 1.8.0 temporarily (#445)" This reverts commit b9c487d148427b4e6763d397c64e2ba5bf4f5706. --- CMakeLists.txt | 2 +- README.md | 2 +- environment-dev.yml | 4 ++-- environment-wasm-host.yml | 2 +- include/xeus-cpp/xinterpreter.hpp | 2 +- src/xinspect.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10f76abc..726dbfd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ endif() set(xeus_REQUIRED_VERSION 5.0.0) set(xeus_zmq_REQUIRED_VERSION 3.0.0) -set(CppInterOp_REQUIRED_VERSION 1.7.0) +set(CppInterOp_REQUIRED_VERSION 1.8.0) set(xeus_lite_REQUIRED_VERSION 3.2.1) if (NOT TARGET xeus AND NOT TARGET xeus-static) diff --git a/README.md b/README.md index 06068c4b..377d3c7c 100644 --- a/README.md +++ b/README.md @@ -207,7 +207,7 @@ http://xeus-cpp.readthedocs.io | `xeus-cpp` | `xeus-zmq` | `CppInterOp` | `pugixml` | `cpp-argparse`| `nlohmann_json` | |------------|-----------------|--------------|-----------|---------------|-----------------| -| main | 3.1.0 | 1.7.0 | 1.15 | 3.2 | 3.12.0 | +| main | 3.1.0 | 1.8.0 | 1.15 | 3.2 | 3.12.0 | ## Contributing diff --git a/environment-dev.yml b/environment-dev.yml index 9a984818..a9c3c681 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -5,13 +5,13 @@ dependencies: # Build dependencies - make - cmake - - cxx-compiler=1.7.0 + - cxx-compiler # Host dependencies - xeus>=5.0.0 - xeus-zmq<4.0 - nlohmann_json - nlohmann_json-abi - - CppInterOp<1.8 + - CppInterOp>=1.8 - pugixml - cpp-argparse # Test dependencies diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml index e32e077a..ef111cae 100644 --- a/environment-wasm-host.yml +++ b/environment-wasm-host.yml @@ -7,7 +7,7 @@ dependencies: - nlohmann_json-abi - xeus-lite - xeus - - CppInterOp<1.8 + - CppInterOp>=1.8 - cpp-argparse - pugixml - doctest diff --git a/include/xeus-cpp/xinterpreter.hpp b/include/xeus-cpp/xinterpreter.hpp index 29eaf13b..92b4e2c7 100644 --- a/include/xeus-cpp/xinterpreter.hpp +++ b/include/xeus-cpp/xinterpreter.hpp @@ -16,7 +16,7 @@ #include #include -#include "clang/Interpreter/CppInterOp.h" // from CppInterOp package +#include #include diff --git a/src/xinspect.cpp b/src/xinspect.cpp index 2511a5ac..09a1933d 100644 --- a/src/xinspect.cpp +++ b/src/xinspect.cpp @@ -14,7 +14,7 @@ #include "xinspect.hpp" -#include "clang/Interpreter/CppInterOp.h" +#include namespace xcpp {