8000 Merge pull request #225 from JohanMabille/upgrade · xtensor-stack/xtensor-python@92b22f8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 92b22f8

Browse files
JohanMabilleJohanMabille
authored
Merge pull request #225 from JohanMabille/upgrade
Upgraded to xtensor 0.21.1
2 parents 0d004f3 + f989b7b commit 92b22f8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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.2 xtensor==0.20.10 -c conda-forge
25+
- conda install pytest numpy pybind11==2.4.3 xtensor==0.21.1 -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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ before_install:
112112
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
113113
export CXX=clang++ CC=clang PYTHONHOME=$HOME/miniconda;
114114
fi
115-
- PYBIND11_VERSION=${PYBIND11_VERSION:-2.4.2}
115+
- PYBIND11_VERSION=${PYBIND11_VERSION:-2.4.3}
116116

117117
install:
118118
# Define the version of miniconda to download
@@ -155,7 +155,7 @@ install:
155155
else
156156
conda install pybind11==${PYBIND11_VERSION} -c conda-forge
157157
fi
158-
- conda install xtensor==0.20.10 -c conda-forge
158+
- conda install xtensor==0.21.1 -c conda-forge
159159
- cmake -D DOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
160160
- make -j2 test_xtensor_python
161161
- make install

0 commit comments

Comments
 (0)
0