Skip to content

Commit 09b8797

Browse files
authored
Merge pull request #133 from JohanMabille/upgrade
Upgrade
2 parents d404797 + 3a67bc5 commit 09b8797

File tree

5 files changed

+5
-13
lines changed

5 files changed

+5
-13
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ install:
2323
- conda config --set always_yes yes --set changeps1 no
2424
- conda update -q conda -c conda-forge
2525
# Host dependencies
26-
- conda install xtensor=0.23.0 r-rcpp r-rinside r-devtools -c conda-forge
26+
- conda install xtensor=0.24.0 r-rcpp r-rinside r-devtools -c conda-forge
2727
# Build dependencies
2828
- conda install m2w64-gcc m2w64-make m2w64-toolchain m2-libbz2 posix -c conda-forge
2929
# Full build on x64 with msys64

.azure-pipelines/azure-pipelines-linux-clang.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ jobs:
22
- job: 'Linux_0'
33
strategy:
44
matrix:
5-
clang_4:
6-
llvm_version: '4.0'
7-
clang_5:
8-
llvm_version: '5.0'
95
clang_6:
106
llvm_version: '6.0'
117
clang_7:
@@ -17,7 +13,7 @@ jobs:
1713
clang_10:
1814
llvm_version: '10'
1915
pool:
20-
vmImage: ubuntu-16.04
16+
vmImage: ubuntu-18.04
2117
variables:
2218
CC: clang-$(llvm_version)
2319
CXX: clang++-$(llvm_version)

.azure-pipelines/azure-pipelines-linux-gcc.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ jobs:
22
- job: 'Linux_1'
33
strategy:
44
matrix:
5-
gcc_4:
6-
gcc_version: '4.9'
7-
gcc_5:
8-
gcc_version: '5'
95
gcc_6:
106
gcc_version: '6'
117
gcc_7:
@@ -15,7 +11,7 @@ jobs:
1511
gcc_9:
1612
gcc_version: '9'
1713
pool:
18-
vmImage: ubuntu-16.04
14+
vmImage: ubuntu-18.04
1915
variables:
2016
CC: gcc-$(gcc_version)
2117
CXX: g++-$(gcc_version)

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set(XTENSOR_R_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
1616
# Versionning
1717
# ===========
1818

19-
set(XTENSOR_REQUIRED_VERSION 0.22.0)
19+
set(XTENSOR_REQUIRED_VERSION 0.24.0)
2020
set(XTL_REQUIRED_VERSION 0.7.0)
2121

2222
set(XTENSOR_R_CONFIG_FILE

environment-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- cmake
6-
- xtensor=0.23.0
6+
- xtensor=0.24.0
77
- r-base
88
- r-rcpp
99
# test dependencies

0 commit comments

Comments
 (0)