From 786affde538682e9627cdbb2d29ba965e2110855 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Thu, 6 Mar 2025 15:07:50 +0000 Subject: [PATCH 1/2] Remove restriction on cpp-argparse version --- README.md | 9 +++++++-- docs/source/InstallationAndUsage.rst | 2 +- environment-dev.yml | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a3b88384..e8984a27 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ source activate "xeus-cpp" ``` We will now install the dependencies needed to compile xeux-cpp from source within this environment by executing the following ```bash -mamba install notebook cmake cxx-compiler xeus-zmq nlohmann_json=3.11.3 jupyterlab CppInterOp cpp-argparse">=3.0,<4.0" pugixml doctest -c conda-forge +mamba install notebook cmake cxx-compiler xeus-zmq nlohmann_json=3.11.3 jupyterlab CppInterOp cpp-argparse pugixml doctest -c conda-forge ``` Now you can compile the kernel from the source by executing (replace `$CONDA_PREFIX` with a custom installation prefix if need be) ```bash @@ -136,9 +136,14 @@ http://xeus-cpp.readthedocs.io - [argparse](https://github.com/p-ranav/argparse) - [CppInterOp](https://github.com/compiler-research/CppInterOp) +| `xeus-cpp` | `xeus-zmq` | `CppInterOp` | `pugixml` | `nlohmann_json` | +|------------|-----------------|--------------|-----------|-----------------| +| main | >=3.0.0,<4.0.0 | >=1.5.0 | ~1.8.1 | >=3.11.3,<4.0 | + +Versions `0.6.0` and prior had a restriction on the exact version of cpp-argparse used + | `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 | | 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 | diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index eb892b8b..ea2ea30e 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -30,7 +30,7 @@ this environment by executing the following .. code-block:: bash mamba install notebook cmake cxx-compiler xeus-zmq nlohmann_json=3.11.3 - jupyterlab CppInterOp cpp-argparse">=3.0,<4.0" pugixml doctest -c conda-forge + jupyterlab CppInterOp cpp-argparse pugixml doctest -c conda-forge Now you can compile the kernel from the source by executing (replace `$CONDA_PREFIX` with a custom installation prefix if need be) diff --git a/environment-dev.yml b/environment-dev.yml index e4adecac..48bebaac 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -12,7 +12,7 @@ dependencies: - nlohmann_json=3.11.3 - CppInterOp - pugixml - - cpp-argparse>=3.0,<4.0 + - cpp-argparse # Test dependencies - pytest - jupyter_kernel_test<0.8 From 0e42de76bcd4ccc20fde9d323368d63da5119a81 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 9 Apr 2025 08:46:39 +0100 Subject: [PATCH 2/2] Remove dependencies table --- README.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/README.md b/README.md index e8984a27..ae8ab797 100644 --- a/README.md +++ b/README.md @@ -136,26 +136,6 @@ http://xeus-cpp.readthedocs.io - [argparse](https://github.com/p-ranav/argparse) - [CppInterOp](https://github.com/compiler-research/CppInterOp) -| `xeus-cpp` | `xeus-zmq` | `CppInterOp` | `pugixml` | `nlohmann_json` | -|------------|-----------------|--------------|-----------|-----------------| -| main | >=3.0.0,<4.0.0 | >=1.5.0 | ~1.8.1 | >=3.11.3,<4.0 | - -Versions `0.6.0` and prior had a restriction on the exact version of cpp-argparse used - -| `xeus-cpp` | `xeus-zmq` | `CppInterOp` | `pugixml` | `cpp-argparse`| `nlohmann_json` | -|------------|-----------------|--------------|-----------|---------------|-----------------| -| 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 | - -Versions prior to `0.5.0` have an additional dependency on [xtl](https://github.com/xtensor-stack/xtl), [clang](https://github.com/llvm/llvm-project/) & [cppzmq](https://github.com/zeromq/cppzmq) - -| `xeus-cpp` | `xeus-zmq` | `xtl` | `clang` | `pugixml` | `cppzmq` | `cpp-argparse`| `nlohmann_json` | -|------------|-----------------|-----------------|-----------|-----------|----------|---------------|-----------------| -| 0.4.0 | >=1.0.0,<2.0.0 | >=0.7.7,<0.8.0 | >=16,<17 | ~1.8.1 | ~4.3.0 | ~2.9 | >=3.6.1,<4.0 | -| 0.3.0 | >=1.0.0,<2.0.0 | >=0.7.7,<0.8.0 | >=16,<17 | ~1.8.1 | ~4.3.0 | ~2.9 | >=3.6.1,<4.0 | -| 0.2.0 | >=1.0.0,<2.0.0 | >=0.7.7,<0.8.0 | >=16,<17 | ~1.8.1 | ~4.3.0 | ~2.9 | >=3.6.1,<4.0 | -| 0.1.0 | >=1.0.0,<2.0.0 | >=0.7.0,<0.8.0 | >=16,<17 | ~1.8.1 | ~4.3.0 | ~2.9 | >=3.6.1,<4.0 | - ## Contributing See [CONTRIBUTING.md](./CONTRIBUTING.md) to know how to contribute and set up a