Skip to content

Commit 818711c

Browse files
committed
Upgraded to xtensor 0.23.0
1 parent 518817a commit 818711c

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

.appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ install:
2121
- conda config --set always_yes yes --set changeps1 no
2222
- conda update -q conda
2323
- conda info -a
24-
- conda install gtest cmake -c conda-forge
25-
- conda install xtensor=0.21.4 -c conda-forge
26-
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DBUILD_TESTS=ON .
24+
- conda env create --file environment-dev.yml
25+
- CALL conda.bat activate xtensor
26+
- cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DDOWNLOAD_GTEST=ON .
2727
- nmake test_xframe
2828
- cd test
2929

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ jobs:
44
matrix:
55
gcc_4:
66
gcc_version: '4.9'
7-
gcc_5_disable_xsimd:
7+
gcc_5:
88
gcc_version: '5'
9-
gcc_6_disable_exception:
9+
gcc_6:
1010
gcc_version: '6'
1111
gcc_7:
1212
gcc_version: '7'
13-
gcc_8_bound_checks:
13+
gcc_8:
1414
gcc_version: '8'
1515
gcc_9:
1616
gcc_version: '9'

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# ![xframe](docs/source/xframe.svg)
22

3-
[![Travis](https://travis-ci.org/xtensor-stack/xframe.svg?branch=master)](https://travis-ci.org/xtensor-stack/xframe)
4-
[![Appveyor](https://ci.appveyor.com/api/projects/status/nhjtyvkefhyo26v5?svg=true)](https://ci.appveyor.com/project/xtensor-stack/xframe)
3+
[![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)
54
[![Documentation](http://readthedocs.org/projects/xframe/badge/?version=latest)](https://xframe.readthedocs.io/en/latest/?badge=latest)
65
[![Binder](https://img.shields.io/badge/launch-binder-brightgreen.svg)](https://mybinder.org/v2/gh/xtensor-stack/xframe/stable?filepath=notebooks%2Fxframe.ipynb)
76
[![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)
@@ -22,7 +21,7 @@ https://xframe.readthedocs.io/
2221

2322
| xframe | xtensor |
2423
|----------|-----------|
25-
| master | ^0.21.4 |
24+
| master | ^0.23.0 |
2625
| 0.3.0 | ^0.21.4 |
2726
| 0.2.0 | ^0.20.0 |
2827
| 0.1.0 | ^0.19.1 |

environment-dev.yml

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

test/downloadGTest.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ project(googletest-download NONE)
1313

1414
include(ExternalProject)
1515
ExternalProject_Add(googletest
16-
GIT_REPOSITORY https://github.com/google/googletest.git
17-
GIT_TAG release-1.8.0
16+
GIT_REPOSITORY https://github.com/JohanMabille/googletest.git
17+
GIT_TAG warnings
1818
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
1919
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
2020
CONFIGURE_COMMAND ""

0 commit comments

Comments
 (0)