From 8f143c1e4d56721e3165e6a362ff19db6ed6dd8f Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Fri, 22 Jan 2021 08:52:00 +0100 Subject: [PATCH] Upgraded to xtensor 0.23.0 --- .appveyor.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 2 +- CMakeLists.txt | 2 +- README.md | 2 +- environment-dev.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a514a6c..a3e9c6b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,7 +21,7 @@ install: - conda update -q conda - conda info -a - conda install cmake -c conda-forge - - conda install xtensor=0.22.0 -c conda-forge + - conda install xtensor=0.23.0 -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 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 0508234..0c610d6 100644 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -36,7 +36,7 @@ jobs: conda install cmake==3.14.0 ^ mkl-devel ^ ninja ^ - xtensor=0.22.0 ^ + xtensor=0.23.0 ^ python=3.6 conda list displayName: "Install conda packages" diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d26941..7280062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ message(STATUS "xtensor-blas v${${PROJECT_NAME}_VERSION}") # Dependencies # ============ -find_package(xtensor 0.21 REQUIRED) +find_package(xtensor 0.23 REQUIRED) message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xtensor") # Build diff --git a/README.md b/README.md index 8a61cc1..701d22a 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ http://xtensor-blas.readthedocs.io/ | `xtensor-blas` | `xtensor` | |-----------------|-----------| -| master | ^0.22.0 | +| master | ^0.23.0 | | 0.18.0 | ^0.22.0 | | 0.17.2 | ^0.21.4 | | 0.17.1 | ^0.21.2 | diff --git a/environment-dev.yml b/environment-dev.yml index 05af7d5..178a879 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -3,4 +3,4 @@ channels: - conda-forge dependencies: - cmake - - xtensor=0.22.0 + - xtensor=0.23.0