Merge pull request #183 from JohanMabille/upgrade_xtensor

JohanMabille · web-flow · commit f0fc08f92979 · 2018-11-16T17:32:15.000+01:00
Upgrade to xtensor 0.18.3
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -4,7 +4,6 @@ os: Visual Studio 2015
 
 platform:
   - x64
-  - x86
 
 environment:
   matrix:
@@ -23,8 +22,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install pytest numpy pybind11==2.2.1 -c conda-forge
-  - conda install xtensor==0.18.0 -c QuantStack
+  - conda install pytest numpy pybind11==2.2.1 xtensor==0.18.3 -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
@@ -147,7 +147,7 @@ install:
       else
         conda install pybind11==${PYBIND11_VERSION} -c conda-forge
       fi
-    - conda install xtensor==0.18.0 -c QuantStack
+    - conda install xtensor==0.18.3 -c conda-forge
     - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda -D PYTHON_EXECUTABLE=$PY_EXE .
     - make -j2 test_xtensor_python
     - make install
diff --git a/test/test_common.hpp b/test/test_common.hpp
@@ -10,7 +10,7 @@
 #define TEST_COMMON_HPP
 
 #include "xtensor/xlayout.hpp"
-#include "xtensor/xstrided_view.hpp"
+#include "xtensor/xmanipulation.hpp"
 
 #include "xtl/xsequence.hpp"
 
