diff --git a/.appveyor.yml b/.appveyor.yml index 58b6d3c..03c8874 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -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 xframe + - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\LIBRARY -DDOWNLOAD_GTEST=ON . - nmake test_xframe - cd test diff --git a/.azure-pipelines/azure-pipelines-linux-gcc.yml b/.azure-pipelines/azure-pipelines-linux-gcc.yml index 206609e..bf18b99 100644 --- a/.azure-pipelines/azure-pipelines-linux-gcc.yml +++ b/.azure-pipelines/azure-pipelines-linux-gcc.yml @@ -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' diff --git a/README.md b/README.md index ca612fd..b6e8906 100644 --- a/README.md +++ b/README.md @@ -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) @@ -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 | diff --git a/environment-dev.yml b/environment-dev.yml index 234c03b..5088fce 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -3,5 +3,5 @@ channels: - conda-forge dependencies: - cmake - - xtensor=0.21.4 + - xtensor=0.23.0 diff --git a/test/downloadGTest.cmake.in b/test/downloadGTest.cmake.in index 172f0b6..6560f8a 100644 --- a/test/downloadGTest.cmake.in +++ b/test/downloadGTest.cmake.in @@ -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 ""