Skip to content

Commit b1190de

Browse files
authored
Merge pull request #241 from JohanMabille/upgrade
Upgrade
2 parents 09850b8 + c06aa32 commit b1190de

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install:
2222
- conda update -q conda
2323
- conda info -a
2424
- conda install gtest cmake -c conda-forge
25-
- conda install xtensor=0.20.5 -c conda-forge
25+
- conda install xtensor=0.21.4 -c conda-forge
2626
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
2727
- nmake test_xframe
2828
- cd test

.travis.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: cpp
2-
dist: trusty
2+
dist: xenial
33
matrix:
44
include:
55
- os: linux
@@ -32,25 +32,14 @@ matrix:
3232
sources:
3333
- ubuntu-toolchain-r-test
3434
packages:
35-
- g++-4.9
36-
- clang-3.6
37-
env: COMPILER=clang CLANG=3.6
38-
- os: linux
39-
addons:
40-
apt:
41-
sources:
42-
- ubuntu-toolchain-r-test
43-
- llvm-toolchain-trusty-3.9
44-
packages:
45-
- g++-4.9
46-
- clang-3.9
47-
env: COMPILER=clang CLANG=3.9
35+
- g++-7
36+
env: COMPILER=gcc GCC=7
4837
- os: linux
4938
addons:
5039
apt:
5140
sources:
5241
- ubuntu-toolchain-r-test
53-
- llvm-toolchain-trusty-4.0
42+
- llvm-toolchain-xenial-4.0
5443
packages:
5544
- g++-4.9
5645
- clang-4.0
@@ -60,7 +49,7 @@ matrix:
6049
apt:
6150
sources:
6251
- ubuntu-toolchain-r-test
63-
- llvm-toolchain-trusty-5.0
52+
- llvm-toolchain-xenial-5.0
6453
packages:
6554
- g++-4.9
6655
- clang-5.0
@@ -70,7 +59,7 @@ matrix:
7059
apt:
7160
sources:
7261
- ubuntu-toolchain-r-test
73-
- llvm-toolchain-trusty-6.0
62+
- llvm-toolchain-xenial-6.0
7463
packages:
7564
- clang-6.0
7665
env: COMPILER=clang CLANG=6.0
@@ -112,7 +101,7 @@ install:
112101
- conda install setuptools
113102
- conda update -q conda
114103
- conda install cmake -c conda-forge
115-
- conda install xtensor=0.20.5 -c conda-forge
104+
- conda install xtensor=0.21.4 -c conda-forge
116105
# Testing
117106
- mkdir build
118107
- cd build

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
| xframe | xtensor |
2020
|----------|-----------|
21-
| master | ^0.20.0 |
21+
| master | ^0.21.4 |
2222
| 0.2.0 | ^0.20.0 |
2323
| 0.1.0 | ^0.19.1 |
2424
| 0.0.2 | ^0.19.1 |

0 commit comments

Comments
 (0)