Skip to content

Commit d602119

Browse files
authored
Merge pull request #181 from JohanMabille/upgrade_xtensor
Upgraded to xtensor 0.23.0
2 parents a0f1348 + 8f143c1 commit d602119

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install:
2121
- conda update -q conda
2222
- conda info -a
2323
- conda install cmake -c conda-forge
24-
- conda install xtensor=0.22.0 -c conda-forge
24+
- conda install xtensor=0.23.0 -c conda-forge
2525
- conda install m2w64-openblas -c msys2
2626
# Patch OpenBLASConfig.cmake
2727
- 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

.azure-pipelines/azure-pipelines-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
conda install cmake==3.14.0 ^
3737
mkl-devel ^
3838
ninja ^
39-
xtensor=0.22.0 ^
39+
xtensor=0.23.0 ^
4040
python=3.6
4141
conda list
4242
displayName: "Install conda packages"

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ message(STATUS "xtensor-blas v${${PROJECT_NAME}_VERSION}")
4444
# Dependencies
4545
# ============
4646

47-
find_package(xtensor 0.21 REQUIRED)
47+
find_package(xtensor 0.23 REQUIRED)
4848
message(STATUS "Found xtensor: ${xtensor_INCLUDE_DIRS}/xtensor")
4949

5050
# Build

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ http://xtensor-blas.readthedocs.io/
6464

6565
| `xtensor-blas` | `xtensor` |
6666
|-----------------|-----------|
67-
| master | ^0.22.0 |
67+
| master | ^0.23.0 |
6868
| 0.18.0 | ^0.22.0 |
6969
| 0.17.2 | ^0.21.4 |
7070
| 0.17.1 | ^0.21.2 |

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ channels:
33
- conda-forge
44
dependencies:
55
- cmake
6-
- xtensor=0.22.0
6+
- xtensor=0.23.0

0 commit comments

Comments
 (0)