Skip to content

Commit

Permalink
Merge pull request #160 from SylvainCorlay/update-xeus-xproperty
Browse files Browse the repository at this point in the history
Update xeus and xproperty
  • Loading branch information
SylvainCorlay committed Jan 11, 2019
2 parents b436b32 + 48f46a0 commit 2fccb22
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
7 changes: 5 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ platform:
- x64

image:
- Visual Studio 2017 Preview
- Visual Studio 2017
- Visual Studio 2015

matrix:
allow_failures:
- image: Visual Studio 2017

environment:
matrix:
- MINICONDA: C:\xwidgets-conda
Expand All @@ -31,7 +34,7 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda install gtest cmake xeus=0.17.0 nlohmann_json=3.3.0 cppzmq==4.3.0 xproperty==0.7.0 xtl==0.5.2 -c QuantStack -c conda-forge
- conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq==4.3.0 xproperty==0.8.0 xtl==0.5.2 -c QuantStack -c conda-forge
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
- nmake test_xwidgets
- cd test
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install:
- hash -r
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda install gtest cmake xeus=0.17.0 nlohmann_json=3.3.0 cppzmq=4.3.0 xproperty xtl=0.5.2 gcc-7 -c QuantStack -c conda-forge
- conda install gtest cmake xeus=0.18.1 nlohmann_json=3.3.0 cppzmq=4.3.0 xproperty=0.8.0 xtl=0.5.2 gcc-7 -c QuantStack -c conda-forge
# Testing
- mkdir build
- cd build
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,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.17.0 REQUIRED)
find_package(xproperty 0.7 REQUIRED)
find_package(xeus 0.18.1 REQUIRED)
find_package(xproperty 0.8 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 @@ -88,7 +88,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.7.0,<0.8 | >=0.17.0,<0.18 | >=3.3.0,<4.0 |
| master | ^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 |
| 0.14.0 | ^3.0.0 | >=0.4.8,<0.5 | >=0.7.0,<0.8 | >=0.15.0,<0.16 | >=3.3.0,<4.0 |
| 0.13.1 | ^3.0.0 | >=0.4.8,<0.5 | >=0.7.0,<0.8 | >=0.14.1,<0.15 | >=3.1.2,<4.0 |
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- QuantStack
- conda-forge
dependencies:
- xeus-cling=0.4.9
- xeus-cling=0.4.10
- xwidgets=0.15.0
- notebook
- widgetsnbextension >=3.0.0

0 comments on commit 2fccb22

Please sign in to comment.