Merge pull request #148 from JohanMabille/upgrade

Upgraded to xtensor 0.21.2

.appveyor.yml

@@ -21,7 +21,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install xtensor=0.20.6 -c conda-forge
+  - conda install xtensor=0.21.2 -c conda-forge
   - conda install m2w64-openblas -c msys2
   # Patch OpenBLASConfig.cmake
   - ps: (Get-Content $Env:MINICONDA\Library\mingw-w64\lib\cmake\openblas\OpenBLASConfig.cmake).replace('mingw64', 'mingw-w64') | Set-Content $Env:MINICONDA\Library\mingw-w64\lib\cmake\openblas\OpenBLASConfig.cmake

.travis.yml

@@ -1,5 +1,5 @@
 language: cpp
-dist: trusty
+dist: xenial
 matrix:
   include:
     - os: linux
@@ -72,7 +72,7 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-3.9
+            - llvm-toolchain-xenial-3.9
           packages:
             - g++-4.9
             - clang-3.9
@@ -82,7 +82,7 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
+            - llvm-toolchain-xenial-4.0
           packages:
             - g++-4.9
             - clang-4.0
@@ -92,7 +92,7 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-xenial-5.0
           packages:
             - g++-4.9
             - clang-5.0
@@ -102,7 +102,7 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-6.0
+            - llvm-toolchain-xenial-6.0
           packages:
             - clang-6.0
       env: COMPILER=clang CLANG=6.0 BLAS=OpenBLAS
@@ -145,7 +145,7 @@ install:
     - conda info -a
     - conda install cmake -c conda-forge
     # Install xtensor and BLAS
-    - conda install xtensor=0.21.1 -c conda-forge
+    - conda install xtensor=0.21.2 -c conda-forge
     - if [[ "$BLAS" == "OpenBLAS" ]]; then
         conda install openblas "blas * openblas" -c conda-forge;
       elif [[ "$BLAS" == "mkl" ]]; then

CMakeLists.txt

@@ -44,7 +44,7 @@ message(STATUS "xtensor-blas v${${PROJECT_NAME}_VERSION}")
 # Dependencies
 # ============
 
-find_package(xtensor 0.20 REQUIRED)
+find_package(xtensor 0.21 REQUIRED)
 message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xtensor")
 
 # Build

README.md

@@ -64,7 +64,7 @@ http://xtensor-blas.readthedocs.io/
 
 | `xtensor-blas`  | `xtensor` |
 |-----------------|-----------|
-| master          |  ^0.21.1  |
+| master          |  ^0.21.2  |
 | 0.17.0          |  ^0.21.1  |
 | 0.16.1          |  ^0.20.4  |
 | 0.16.0          |  ^0.20.0  |

azure-pipelines.yml

@@ -42,7 +42,7 @@ jobs:
                         gtest ^
                         mkl-devel ^
                         ninja ^
-                        xtensor=0.20.6 ^
+                        xtensor=0.21.2 ^
                         python=3.6
           conda list
         displayName: "Install conda packages"

test/downloadGTest.cmake.in

@@ -14,7 +14,7 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
     GIT_REPOSITORY    https://github.com/google/googletest.git
-    GIT_TAG           release-1.8.0
+    GIT_TAG           release-1.10.0
     SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
     BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
     CONFIGURE_COMMAND ""