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
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
with:
environment-file: environment-dev.yml
environment-name: xeus-octave
Expand All @@ -45,16 +45,16 @@ jobs:
static-analysis:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
with:
environment-file: environment-dev.yml
environment-name: xeus-octave
cache-downloads: true
- name: Set PYTHON_HASH
run: echo "PYTHON_HASH=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/pre-commit
key: precommit-v1-${{ env.PYTHON_HASH }}-${{ hashFiles('.pre-commit-config.yaml') }}
Expand All @@ -64,9 +64,9 @@ jobs:
test-doc:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Install micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v2
with:
environment-file: environment-dev.yml
environment-name: xeus-octave
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v6.0.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand Down Expand Up @@ -32,6 +32,6 @@ repos:
hooks:
- id: cmake-format
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.18.3
rev: 0.33.2
hooks:
- id: check-github-workflows
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Contributing to Xeus-Octave

*Xeus* and *Xeus-Octave* are subprojects of Project Jupyter and subject to the
`Jupyter governance <https://github.com/jupyter/governance>`_ and
`Code of conduct <https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md>`_.
`Code of conduct <https://github.com/jupyter/governance/blob/main/conduct/code_of_conduct.md>`_.

General Guidelines
~~~~~~~~~~~~~~~~~~
Expand Down
11 changes: 5 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -114,36 +114,35 @@ The safest usage is to create an environment named ``xeus-octave``
mamba activate -n myenv

Then you can install in this freshly created environment other dependencies, such as ``notebook``
or JupyterLab_
or JupyterLab_.

.. code::

mamba install -c conda-forge jupyterlab

From Source
~~~~~~~~~~~
You can install ``xeus-octave`` from source with Cmake.
You can install ``xeus-octave`` from source with CMake.
This requires that you have all the dependencies installed in the same prefix, for instance a
superset of these dependencies can be found in the file ``environment-dev.yml``.

.. code:: bash

mamba install --file environment-dev.yml

Then you can install in the same Conda environment with
Then you can install ``xeus-octave`` in the same Conda environment with

.. code:: bash

cmake -B build -D CMAKE_PREFIX_PATH="${CONDA_PREFIX}" -D CMAKE_INSTALL_PREFIX="${CONDA_PREFIX}"
cmake --build build --parallel 4
cmake --install build

.. Sphink linkcheck fails on this anchor https://github.com/conda-forge/miniforge#mambaforge
.. Sphinx linkcheck fails on this anchor https://github.com/conda-forge/miniforge#mambaforge
.. _miniforge: https://github.com/conda-forge/miniforge
.. _miniconda: https://conda.io/miniconda.html
.. _miniconda: https://www.anaconda.com/docs/getting-started/miniconda/main
.. _anaconda: https://www.anaconda.com
.. _JupyterLab: https://jupyterlab.readthedocs.io
.. _xeus-octave-wheel: https://github.com/jupyter-xeus/xeus-octave-wheel

.. [[INSTALLATION CONTENT END]]

Expand Down
3 changes: 0 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@

html_theme = "sphinx_rtd_theme"

html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]


def setup(app):
app.add_css_file("main_stylesheet.css")

Expand Down
4 changes: 2 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ dependencies:
- pre-commit
- clang-tools
- clang
- jupyter_kernel_test>=0.5,<0.6
- jupyter_kernel_test>=0.6,<0.7
- nbval
- pytest
- pytest-rerunfailures
# Doc dependencies
- doxygen
- sphinx <6
- sphinx
- breathe
- sphinx_rtd_theme
# Dev dependencies
Expand Down
4 changes: 2 additions & 2 deletions src/xinterpreter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,8 @@ std::string get_symbol_from_cursor_pos(std::string const& code, size_t cursor_po

size_t end_pos = cursor_pos ? ++cursor_pos : 0;

while (end_pos < code.size() && (std::isalnum(code.at(end_pos)) || code.at(end_pos) == '_' || code.at(end_pos) == '.')
)
while (end_pos < code.size() &&
(std::isalnum(code.at(end_pos)) || code.at(end_pos) == '_' || code.at(end_pos) == '.'))
{
end_pos++;
}
Expand Down
Loading