Merge pull request #127 from JohanMabille/xtensor_014

Upgraded to xtensor 0.14.0

Author: JohanMabille

.appveyor.yml

@@ -23,7 +23,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install xtensor==0.13.1 pytest numpy pybind11==2.2.1 -c conda-forge
+  - conda install xtensor==0.14.0 pytest numpy pybind11==2.2.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

.travis.yml

@@ -95,7 +95,7 @@ install:
     - conda update -q conda
     # Useful for debugging any issues with conda
     - conda info -a
-    - conda install xtensor==0.13.1 pytest numpy pybind11==2.2.1 -c conda-forge
+    - conda install xtensor==0.14.0 pytest numpy pybind11==2.2.1 -c conda-forge
     - conda install cmake gtest -c conda-forge
     - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
     - make -j2 test_xtensor_python

README.md

@@ -191,7 +191,7 @@ from the `docs` subdirectory.
 
 | `xtensor-python` | `xtensor` |  `pybind11`      |
 |------------------|-----------|------------------|
-| master           |  ^0.13.1  | ~2.1.0 or ~2.2.1 |
+| master           |  ^0.14.0  | ~2.1.0 or ~2.2.1 |
 | 0.15.x           |  ^0.13.1  | ~2.1.0 or ~2.2.1 |
 | 0.14.x           |  ^0.12.0  | ~2.1.0 or ~2.2.1 |
 | 0.13.x           |  ^0.11.0  | ~2.1.0 or ~2.2.1 |

include/xtensor-python/pycontainer.hpp

@@ -25,7 +25,10 @@
 #define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION
 
 #include "numpy/arrayobject.h"
+// Required because pyconfig.hpp defines copysign to _copysign
+#undef copysign
 
+#include <cmath>
 #include "xtensor/xcontainer.hpp"
 
 #include "xtl/xsequence.hpp"

test/main.cpp

@@ -6,6 +6,8 @@
 * The full license is in the file LICENSE, distributed with this software. *
 ****************************************************************************/
 
+// Required to avoid the error "std does not have memeber copysign"
+#include <cmath>
 #include <Python.h>
 
 #include "pybind11/numpy.h"

test/test_common.hpp

@@ -10,7 +10,7 @@
 #define TEST_COMMON_HPP
 
 #include "xtensor/xlayout.hpp"
-#include "xtensor/xstridedview.hpp"
+#include "xtensor/xstrided_view.hpp"
 
 #include "xtl/xsequence.hpp"