Skip to content

Commit

Permalink
Upgraded to xtensor 0.23.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanMabille committed Jan 26, 2021
1 parent 518817a commit 818711c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ install:
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- conda info -a
- conda install gtest cmake -c conda-forge
- conda install xtensor=0.21.4 -c conda-forge
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
- conda env create --file environment-dev.yml
- CALL conda.bat activate xtensor
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DDOWNLOAD_GTEST=ON .
- nmake test_xframe
- cd test

Expand Down
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-linux-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ jobs:
matrix:
gcc_4:
gcc_version: '4.9'
gcc_5_disable_xsimd:
gcc_5:
gcc_version: '5'
gcc_6_disable_exception:
gcc_6:
gcc_version: '6'
gcc_7:
gcc_version: '7'
gcc_8_bound_checks:
gcc_8:
gcc_version: '8'
gcc_9:
gcc_version: '9'
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# ![xframe](docs/source/xframe.svg)

[![Travis](https://travis-ci.org/xtensor-stack/xframe.svg?branch=master)](https://travis-ci.org/xtensor-stack/xframe)
[![Appveyor](https://ci.appveyor.com/api/projects/status/nhjtyvkefhyo26v5?svg=true)](https://ci.appveyor.com/project/xtensor-stack/xframe)
[![Azure Pipelines](https://dev.azure.com/xtensor-stack/xtensor-stack/_apis/build/status/xtensor-stack.xframe?branchName=master)](https://dev.azure.com/xtensor-stack/xtensor-stack/_build/latest?definitionId=12&branchName=master)[![Appveyor](https://ci.appveyor.com/api/projects/status/nhjtyvkefhyo26v5?svg=true)](https://ci.appveyor.com/project/xtensor-stack/xframe)
[![Documentation](http://readthedocs.org/projects/xframe/badge/?version=latest)](https://xframe.readthedocs.io/en/latest/?badge=latest)
[![Binder](https://img.shields.io/badge/launch-binder-brightgreen.svg)](https://mybinder.org/v2/gh/xtensor-stack/xframe/stable?filepath=notebooks%2Fxframe.ipynb)
[![Join the Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/QuantStack/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Expand All @@ -22,7 +21,7 @@ https://xframe.readthedocs.io/

| xframe | xtensor |
|----------|-----------|
| master | ^0.21.4 |
| master | ^0.23.0 |
| 0.3.0 | ^0.21.4 |
| 0.2.0 | ^0.20.0 |
| 0.1.0 | ^0.19.1 |
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ channels:
- conda-forge
dependencies:
- cmake
- xtensor=0.21.4
- xtensor=0.23.0

4 changes: 2 additions & 2 deletions test/downloadGTest.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ project(googletest-download NONE)

include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.8.0
GIT_REPOSITORY https://github.com/JohanMabille/googletest.git
GIT_TAG warnings
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
CONFIGURE_COMMAND ""
Expand Down

0 comments on commit 818711c

Please sign in to comment.