Skip to content

Commit

Permalink
Merge pull request #168 from JohanMabille/upgrade_xeus
Browse files Browse the repository at this point in the history
upgraded to xeus 0.21.1
  • Loading branch information
JohanMabille committed Jul 18, 2019
2 parents b120608 + 0433a76 commit e8df085
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 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.20.0 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.6.1 -c conda-forge
- conda install xeus=0.21.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.6.1 -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.20.0 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.6.1 -c conda-forge
- conda install xeus=0.21.1 cppzmq=4.3.0 xproperty=0.8.1 nlohmann_json=3.6.1 -c conda-forge
# Install build dependencies
- conda install cmake -c conda-forge
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ message(STATUS "xwidgets binary version: v${XWIDGETS_BINARY_VERSION}")

find_package(cppzmq 4.3.0 REQUIRED)
find_package(xtl 0.6.5 REQUIRED)
find_package(xeus 0.20.0 REQUIRED)
find_package(xeus 0.21.1 REQUIRED)
find_package(xproperty 0.8.1 REQUIRED)

# Source files
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,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.6.5,<0.7 | >=0.8.1,<0.9 | >=0.20.0,<0.21 | >=3.6.1,<4.0 |
| master | ^3.0.0 | >=0.6.5,<0.7 | >=0.8.1,<0.9 | >=0.21.1,<0.22 | >=3.6.1,<4.0 |
| 0.18.0 | ^3.0.0 | >=0.6.5,<0.7 | >=0.8.1,<0.9 | >=0.20.0,<0.21 | >=3.6.1,<4.0 |
| 0.17.0 | ^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 |
Expand Down

0 comments on commit e8df085

Please sign in to comment.