diff --git a/.azure-pipelines/azure-pipelines-linux-clang.yml b/.azure-pipelines/azure-pipelines-linux-clang.yml index 7d61252..533408d 100644 --- a/.azure-pipelines/azure-pipelines-linux-clang.yml +++ b/.azure-pipelines/azure-pipelines-linux-clang.yml @@ -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: @@ -17,7 +13,7 @@ jobs: clang_10: llvm_version: '10' pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-18.04 variables: CC: clang-$(llvm_version) CXX: clang++-$(llvm_version) diff --git a/.azure-pipelines/azure-pipelines-linux-gcc.yml b/.azure-pipelines/azure-pipelines-linux-gcc.yml index bf18b99..d339f5c 100644 --- a/.azure-pipelines/azure-pipelines-linux-gcc.yml +++ b/.azure-pipelines/azure-pipelines-linux-gcc.yml @@ -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: @@ -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) diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 84a6b66..0000000 --- a/.travis.yml +++ /dev/null @@ -1,112 +0,0 @@ -language: cpp -dist: xenial -matrix: - include: - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - env: COMPILER=gcc GCC=4.9 - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 - env: COMPILER=gcc GCC=5 - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - env: COMPILER=gcc GCC=6 - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - env: COMPILER=gcc GCC=7 - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-4.0 - packages: - - g++-4.9 - - clang-4.0 - env: COMPILER=clang CLANG=4.0 - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-5.0 - packages: - - g++-4.9 - - clang-5.0 - env: COMPILER=clang CLANG=5.0 - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-6.0 - packages: - - clang-6.0 - env: COMPILER=clang CLANG=6.0 - - os: osx - osx_image: xcode8 - compiler: clang -env: - global: - - MINCONDA_VERSION="latest" - - MINCONDA_LINUX="Linux-x86_64" - - MINCONDA_OSX="MacOSX-x86_64" -before_install: - - | - # Configure build variables - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$COMPILER" == "gcc" ]]; then - export CXX=g++-$GCC CC=gcc-$GCC; - fi - if [[ "$COMPILER" == "clang" ]]; then - export CXX=clang++-$CLANG CC=clang-$CLANG; - fi - elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - export CXX=clang++ CC=clang; - fi -install: - # Define the version of miniconda to download - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - MINCONDA_OS=$MINCONDA_LINUX; - elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - MINCONDA_OS=$MINCONDA_OSX; - fi - - wget "http://repo.continuum.io/miniconda/Miniconda3-$MINCONDA_VERSION-$MINCONDA_OS.sh" -O miniconda.sh; - - bash miniconda.sh -b -p $HOME/miniconda - - export PATH="$HOME/miniconda/bin:$PATH" - - hash -r - - conda config --set always_yes yes --set changeps1 no - # The 2 following lines are a workaround to https://github.com/conda/conda/issues/9337 - - pip uninstall -y setuptools - - conda install setuptools - - conda update -q conda - - conda install cmake -c conda-forge - - conda install xtensor=0.21.4 -c conda-forge - # Testing - - mkdir build - - cd build - - cmake -DDOWNLOAD_GTEST=ON ..; - - make -j2 test_xframe - - cd test -script: - - ./test_xframe diff --git a/README.md b/README.md index f1ff101..0b8f343 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ mamba install -c conda-forge xtensor | xframe | xtensor | |----------|-----------| -| master | ^0.21.4 | +| master | ^0.24.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..440b3af 100644 --- a/environment-dev.yml +++ b/environment-dev.yml @@ -3,5 +3,5 @@ channels: - conda-forge dependencies: - cmake - - xtensor=0.21.4 + - xtensor=0.25.0