Skip to content

Commit 7963466

Browse files
authored
Merge pull request #233 from JohanMabille/upgrade
Upgraded to latest version of xtensor
2 parents 302ff55 + ef145df commit 7963466

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
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 pytest numpy pybind11==2.4.3 xtensor==0.21.2 -c conda-forge
25+
- conda install pytest numpy pybind11==2.4.3 xtensor==0.21.4 -c conda-forge
2626
- "set PYTHONHOME=%MINICONDA%"
2727
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
2828
- nmake test_xtensor_python

.travis.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,25 +42,6 @@ matrix:
4242
packages:
4343
- g++-7
4444
env: COMPILER=gcc GCC=7 PY=3
45-
- os: linux
46-
addons:
47-
apt:
48-
sources:
49-
- ubuntu-toolchain-r-test
50-
packages:
51-
- g++-4.9
52-
- clang-3.6
53-
env: COMPILER=clang CLANG=3.6 PY=3
54-
- os: linux
55-
addons:
56-
apt:
57-
sources:
58-
- ubuntu-toolchain-r-test
59-
- llvm-toolchain-xenial-3.9
60-
packages:
61-
- g++-4.9
62-
- clang-3.9
63-
env: COMPILER=clang CLANG=3.9 PY=3
6445
- os: linux
6546
addons:
6647
apt:
@@ -156,7 +137,7 @@ install:
156137
else
157138
conda install pybind11==${PYBIND11_VERSION} -c conda-forge
158139
fi
159-
- conda install xtensor==0.21.2 -c conda-forge
140+
- conda install xtensor==0.21.4 -c conda-forge
160141
- cmake -D DOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
161142
- make -j2 test_xtensor_python
162143
- make install

0 commit comments

Comments
 (0)