Skip to content

Commit 73d3558

Browse files
authored
Merge branch 'main' into anutosh491-patch-3
2 parents 649cd7d + 1c6acad commit 73d3558

File tree

7 files changed

+15
-8
lines changed

7 files changed

+15
-8
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
push:
77
branches:
88
- main
9+
schedule:
10+
- cron: '30 20 * * *' # Warning: Timezone dep - 20:00 is 1:00
911

1012
permissions:
1113
contents: read
@@ -22,7 +24,7 @@ jobs:
2224
include:
2325
- name: Github-page
2426
os: ubuntu-24.04
25-
emsdk_ver: "3.1.45"
27+
2628
steps:
2729
- uses: actions/checkout@v4
2830
with:

.github/workflows/main.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
push:
99
branches:
1010
- main
11+
schedule:
12+
- cron: '30 20 * * *' # Warning: Timezone dep - 20:00 is 1:00
1113

1214
concurrency:
1315
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -175,7 +177,7 @@ jobs:
175177
176178
- name: Upload to codecov.io
177179
if: ${{ success() && (matrix.coverage == true) }}
178-
uses: codecov/codecov-action@v4
180+
uses: codecov/codecov-action@v5
179181
with:
180182
file: ./coverage.info
181183
fail_ci_if_error: true

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
# Jupyter
3232
.ipynb_checkpoints/
3333

34+
# Default names for Jupyter notebooks
35+
Untitled*.ipynb
36+
3437
# Python
3538
__pycache__/
3639

@@ -41,4 +44,4 @@ bld
4144

4245
# LLM Implementation
4346
*_api_key.txt
44-
*_chat_history.txt
47+
*_chat_history.txt

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ source activate "xeus-cpp"
4040
```
4141
We will now install the dependencies needed to compile xeux-cpp from source within this environment by executing the following
4242
```bash
43-
mamba install notebook cmake cxx-compiler xeus-zmq nlohmann_json=3.11.3 jupyterlab CppInterOp cpp-argparse"<3.1" pugixml doctest -c conda-forge
43+
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
4444
```
4545
Now you can compile the kernel from the source by executing (replace `$CONDA_PREFIX` with a custom installation prefix if need be)
4646
```bash
@@ -132,7 +132,7 @@ http://xeus-cpp.readthedocs.io
132132

133133
| `xeus-cpp` | `xeus-zmq` | `CppInterOp` | `pugixml` | `cpp-argparse`| `nlohmann_json` |
134134
|------------|-----------------|--------------|-----------|---------------|-----------------|
135-
| main | >=3.0.0,<4.0.0 | >=1.5.0 | ~1.8.1 | <3.1 | >=3.11.3,<4.0 |
135+
| main | >=3.0.0,<4.0.0 | >=1.5.0 | ~1.8.1 | >=3.0,<4.0 | >=3.11.3,<4.0 |
136136
| 0.6.0 | >=3.0.0,<4.0.0 | >=1.5.0 | ~1.8.1 | <3.1 | >=3.11.3,<4.0 |
137137
| 0.5.0 | >=3.0.0,<4.0.0 | >=1.3.0 | ~1.8.1 | <3.1 | >=3.11.3,<4.0 |
138138

docs/source/InstallationAndUsage.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ this environment by executing the following
3030
.. code-block:: bash
3131
3232
mamba install notebook cmake cxx-compiler xeus-zmq nlohmann_json=3.11.3
33-
jupyterlab CppInterOp cpp-argparse<3.1 pugixml doctest -c conda-forge
33+
jupyterlab CppInterOp cpp-argparse">=3.0,<4.0" pugixml doctest -c conda-forge
3434
3535
Now you can compile the kernel from the source by executing (replace `$CONDA_PREFIX`
3636
with a custom installation prefix if need be)

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- nlohmann_json=3.11.3
1313
- CppInterOp>=1.5.0
1414
- pugixml
15-
- cpp-argparse <3.1
15+
- cpp-argparse>=3.0,<4.0
1616
# Test dependencies
1717
- pytest
1818
- jupyter_kernel_test<0.8

include/xeus-cpp/xeus_cpp_config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
// Project version
1313
#define XEUS_CPP_VERSION_MAJOR 0
14-
#define XEUS_CPP_VERSION_MINOR 6
14+
#define XEUS_CPP_VERSION_MINOR 7
1515
#define XEUS_CPP_VERSION_PATCH 0
1616
#define XEUS_CPP_VERSION_LABEL dev
1717

0 commit comments

Comments
 (0)