Skip to content

Commit

Permalink
Merge pull request #51 from JohanMabille/upgrade_widget
Browse files Browse the repository at this point in the history
Upgraded to xwidget 0.19.0 and xeus 0.21.1
  • Loading branch information
JohanMabille committed Jul 19, 2019
2 parents 3399c4b + fac7bb9 commit bcc25e6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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 xwidgets=0.18.0 -c conda-forge
- conda install xeus=0.21.1 cppzmq=4.3.0 xproperty=0.8.1 xwidgets=0.19.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.20.0 cppzmq=4.3.0 xproperty=0.8.1 xwidgets=0.18.0 -c conda-forge
- conda install xeus=0.21.1 cppzmq=4.3.0 xproperty=0.8.1 xwidgets=0.19.0 -c conda-forge
# Install build dependencies
- conda install cmake
- 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 @@ -74,8 +74,8 @@ message(STATUS "xplot binary version: v${XPLOT_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(xwidgets 0.18.0 REQUIRED)
find_package(xeus 0.21.1 REQUIRED)
find_package(xwidgets 0.19.0 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 @@ -79,7 +79,7 @@ All the dependencies of xplot are available for the conda package manager.

| `xplot` | `xwidgets` | `xeus` |
|---------|-------------|-----------------|
| master | ~0.18.0 | >=0.20.0,<0.21 |
| master | ~0.19.0 | >=0.21.1,<0.22 |
| 0.13.0 | ~0.18.0 | >=0.20.0,<0.21 |
| 0.12.0 | ~0.17.0 | >=0.19.1,<0.20 |
| 0.11.1 | ~0.16.1 | >=0.18.1,<0.19 |
Expand Down

0 comments on commit bcc25e6

Please sign in to comment.