Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ jobs:
- name: osx15-x86
os: macos-15-intel
micromamba_shell_init: bash
- name: osx14-arm
os: macos-14
micromamba_shell_init: bash
- name: osx15-arm
os: macos-15
micromamba_shell_init: bash
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ dependencies:
# Build dependencies
- make
- cmake
- cxx-compiler=1.7.0
- cxx-compiler
Comment thread
mcbarton marked this conversation as resolved.
# Host dependencies
- xeus>=5.0.0
- xeus-zmq<4.0
- nlohmann_json
- nlohmann_json-abi
- CppInterOp
- CppInterOp>1.7.0
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In don't understand the strict upper bound on 1.7.0.

Shouldn't it be a non-strict on 1.8?

- pugixml
- cpp-argparse
# Test dependencies
Expand Down
2 changes: 1 addition & 1 deletion environment-wasm-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- nlohmann_json-abi
- xeus-lite
- xeus
- CppInterOp
- CppInterOp>1.7.0
Comment thread
mcbarton marked this conversation as resolved.
- cpp-argparse
- pugixml
- doctest
2 changes: 1 addition & 1 deletion include/xeus-cpp/xinterpreter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <string>
#include <vector>

#include "clang/Interpreter/CppInterOp.h" // from CppInterOp package
#include <CppInterOp/CppInterOp.h>

Comment thread
mcbarton marked this conversation as resolved.
#include <nlohmann/json.hpp>

Expand Down
2 changes: 1 addition & 1 deletion src/xinspect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#include "xinspect.hpp"

#include "clang/Interpreter/CppInterOp.h"
#include <CppInterOp/CppInterOp.h>

namespace xcpp
{
Expand Down