Skip to content

Commit e8c3527

Browse files
authored
Merge pull request #269 from JohanMabille/upgrade
Upgrade
2 parents 601ae86 + 08d0004 commit e8c3527

File tree

5 files changed

+6
-14
lines changed

5 files changed

+6
-14
lines changed

.appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ install:
2121
- conda config --set always_yes yes --set changeps1 no
2222
- conda update -q conda
2323
- conda info -a
24-
- conda install cmake -c conda-forge
25-
- conda install pytest numpy pybind11==2.4.3 xtensor==0.23.10 -c conda-forge
24+
- conda install mamba -c conda-forge
25+
- mamba install cmake pytest numpy pybind11 xtensor==0.24.0 -c conda-forge
2626
- "set PYTHONHOME=%MINICONDA%"
2727
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe -DDOWNLOAD_GTEST=ON .
2828
- nmake test_xtensor_python

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

+1-5
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:
@@ -15,7 +11,7 @@ jobs:
1511
clang_9:
1612
llvm_version: '9'
1713
pool:
18-
vmImage: ubuntu-16.04
14+
vmImage: ubuntu-18.04
1915
variables:
2016
CC: clang-$(llvm_version)
2117
CXX: clang++-$(llvm_version)

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

+1-5
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ message(STATUS "xtensor-python v${${PROJECT_NAME}_VERSION}")
3232
# Dependencies
3333
# ============
3434

35-
set(xtensor_REQUIRED_VERSION 0.21.2)
35+
set(xtensor_REQUIRED_VERSION 0.24.0)
3636
if(TARGET xtensor)
3737
set(xtensor_VERSION ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
3838
# Note: This is not SEMVER compatible comparison

environment-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies:
55
# Build dependencies
66
- cmake
77
# Host dependencies
8-
- xtensor=0.23.10
8+
- xtensor=0.24.0
99
- numpy
1010
- pybind11=2.4.3
1111
# Test dependencies

0 commit comments

Comments
 (0)