Skip to content

Upgrade #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohanMabille merged 4 commits into from
Oct 19, 2021
Merged

Upgrade #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8495d81
Upgraded to xtenosr 0.24.0
JohanMabille Oct 18, 2021
16cce96
Upgraded azure to Ubuntu 18.04
JohanMabille Oct 18, 2021
7e88bfc
Use mamba on Windows
JohanMabille Oct 19, 2021
08d0004
triggers CI
JohanMabille Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda install cmake -c conda-forge
- conda install pytest numpy pybind11==2.4.3 xtensor==0.23.10 -c conda-forge
- conda install mamba -c conda-forge
- mamba install cmake pytest numpy pybind11 xtensor==0.24.0 -c conda-forge
- "set PYTHONHOME=%MINICONDA%"
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe -DDOWNLOAD_GTEST=ON .
- nmake test_xtensor_python
Expand Down
6 changes: 1 addition & 5 deletions .azure-pipelines/azure-pipelines-linux-clang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ jobs:
- job: 'Linux_0'
strategy:
matrix:
clang_4:
llvm_version: '4.0'
clang_5:
llvm_version: '5.0'
clang_6:
llvm_version: '6.0'
clang_7:
Expand All @@ -15,7 +11,7 @@ jobs:
clang_9:
llvm_version: '9'
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
variables:
CC: clang-$(llvm_version)
CXX: clang++-$(llvm_version)
Expand Down
6 changes: 1 addition & 5 deletions .azure-pipelines/azure-pipelines-linux-gcc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ jobs:
- job: 'Linux_1'
strategy:
matrix:
gcc_4:
gcc_version: '4.9'
gcc_5:
gcc_version: '5'
gcc_6:
gcc_version: '6'
gcc_7:
Expand All @@ -15,7 +11,7 @@ jobs:
gcc_9:
gcc_version: '9'
pool:
vmImage: ubuntu-16.04
vmImage: ubuntu-18.04
variables:
CC: gcc-$(gcc_version)
CXX: g++-$(gcc_version)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ message(STATUS "xtensor-python v${${PROJECT_NAME}_VERSION}")
# Dependencies
# ============

set(xtensor_REQUIRED_VERSION 0.21.2)
set(xtensor_REQUIRED_VERSION 0.24.0)
if(TARGET xtensor)
set(xtensor_VERSION ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
# Note: This is not SEMVER compatible comparison
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
# Build dependencies
- cmake
# Host dependencies
- xtensor=0.23.10
- xtensor=0.24.0
- numpy
- pybind11=2.4.3
# Test dependencies
Expand Down