From f989b7bb9306a1a02500d2855472f6ae49b5544d Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Mon, 9 Dec 2019 14:09:55 +0100 Subject: [PATCH] Upgraded to xtensor 0.21.1 --- .appveyor.yml | 2 +- .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2521ede..7563438 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,7 +22,7 @@ install: - conda update -q conda - conda info -a - conda install gtest cmake -c conda-forge - - conda install pytest numpy pybind11==2.4.2 xtensor==0.20.10 -c conda-forge + - conda install pytest numpy pybind11==2.4.3 xtensor==0.21.1 -c conda-forge - "set PYTHONHOME=%MINICONDA%" - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe . - nmake test_xtensor_python diff --git a/.travis.yml b/.travis.yml index f29c9f3..975cd24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,7 +112,7 @@ before_install: elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export CXX=clang++ CC=clang PYTHONHOME=$HOME/miniconda; fi - - PYBIND11_VERSION=${PYBIND11_VERSION:-2.4.2} + - PYBIND11_VERSION=${PYBIND11_VERSION:-2.4.3} install: # Define the version of miniconda to download @@ -155,7 +155,7 @@ install: else conda install pybind11==${PYBIND11_VERSION} -c conda-forge fi - - conda install xtensor==0.20.10 -c conda-forge + - conda install xtensor==0.21.1 -c conda-forge - cmake -D DOWNLOAD_GTEST=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE . - make -j2 test_xtensor_python - make install