Skip to content

Commit

Permalink
Merge pull request #90 from JohanMabille/upgrade_xtensor
Browse files Browse the repository at this point in the history
upgraded to xtensor 0.18.3
  • Loading branch information
JohanMabille committed Nov 16, 2018
2 parents 9725a50 + 43426cf commit 5d2cb7d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ os: Visual Studio 2015

platform:
- x64
- x86

environment:
MINICONDA: C:\xtensor-conda
Expand All @@ -21,7 +20,7 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda install xtensor=0.18.0 -c quantstack
- conda install xtensor=0.18.3 -c conda-forge
- conda install gtest cmake -c conda-forge
- conda install m2w64-openblas -c msys2
# Patch OpenBLASConfig.cmake
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ install:
- conda info -a
- conda install gtest cmake -c conda-forge
# Install xtensor and BLAS
- conda install xtensor=0.18.0 -c quantstack
- conda install xtensor=0.18.3 -c conda-forge
- if [[ "$BLAS" == "OpenBLAS" ]]; then
conda install openblas -c conda-forge;
elif [[ "$BLAS" == "mkl" ]]; then
Expand Down

0 comments on commit 5d2cb7d

Please sign in to comment.