Skip to content

Commit

Permalink
Merge pull request #164 from SylvainCorlay/update-xeus
Browse files Browse the repository at this point in the history
Update to xeus 0.19.1
  • Loading branch information
SylvainCorlay committed Mar 23, 2019
2 parents 97137b5 + e8fb506 commit e724139
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ install:
- conda update -q conda
- conda info -a
# Install host dependencies
- conda install xeus=0.18.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.4.0 -c conda-forge
- conda install xeus=0.19.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.5.0 -c conda-forge
# Install build dependencies
- conda install gtest cmake -c conda-forge
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
# Install host dependencies
- conda install xeus=0.18.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.4.0 -c conda-forge
- conda install xeus=0.19.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.5.0 -c conda-forge
# Install build dependencies
- conda install cmake -c conda-forge
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ message(STATUS "xwidgets binary version: v${XWIDGETS_BINARY_VERSION}")
# ============

find_package(cppzmq 4.3.0 REQUIRED)
find_package(xtl 0.5.2 REQUIRED)
find_package(xeus 0.18.1 REQUIRED)
find_package(xtl 0.6.1 REQUIRED)
find_package(xeus 0.19.1 REQUIRED)
find_package(xproperty 0.8.1 REQUIRED)

# Source files
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ We provide a package for the conda package manager.
- Installing `xwidgets` and the C++ kernel

```bash
conda install xeus-cling xwidgets -c QuantStack -c conda-forge
conda install xeus-cling xwidgets -c conda-forge
```

Then, the front-end extension must be installed for either the classic notebook
Expand All @@ -55,10 +55,6 @@ This command defaults to installing the latest version of the JupyterLab
extension. Depending on the version of `xwidgets` and `jupyterlab` you have
installed you may need an older version.

## Jupyterlab extension version compatibility

Specific version of

## Installation from sources

Or you can directly install it from the sources if you have all the
Expand Down Expand Up @@ -88,7 +84,7 @@ All the dependencies of xwidgets are available for the conda package manager.

| `xwidgets` | `widgetsnbextension` | `xtl` | `xproperty` | `xeus` | `nlohmann_json` |
|------------|-----------------------|----------------|---------------|-----------------|-----------------|
| master | ^3.0.0 | >=0.5.2,<0.6 | >=0.8.1,<0.9 | >=0.18.1,<0.19 | >=3.3.0,<4.0 |
| master | ^3.0.0 | >=0.6.1,<0.7 | >=0.8.1,<0.9 | >=0.19.1,<0.20 | >=3.5.0,<4.0 |
| 0.16.1 | ^3.0.0 | >=0.5.2,<0.6 | >=0.8.1,<0.9 | >=0.18.1,<0.19 | >=3.3.0,<4.0 |
| 0.16.0 | ^3.0.0 | >=0.5.2,<0.6 | >=0.8.0,<0.9 | >=0.18.1,<0.19 | >=3.3.0,<4.0 |
| 0.15.0 | ^3.0.0 | >=0.5.2,<0.6 | >=0.7.0,<0.8 | >=0.17.0,<0.18 | >=3.3.0,<4.0 |
Expand Down
2 changes: 1 addition & 1 deletion docs/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The package will also pull all the dependencies.

.. code::
conda install -c QuantStack xwidgets
conda install xwidgets -c conda-forge
.. image:: cmake.svg

Expand Down

0 comments on commit e724139

Please sign in to comment.