From 60ed92c44f20a44935fe255c8025ee6b76f5c342 Mon Sep 17 00:00:00 2001
From: Johan Mabille <johan.mabille@gmail.com>
Date: Wed, 20 Oct 2021 17:19:15 +0200
Subject: [PATCH 1/2] Upgraded to xtensor 0.24.0

---
 CMakeLists.txt      | 2 +-
 README.md           | 2 +-
 environment-dev.yml | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5009e80..263aaae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ message(STATUS "Building zarray v${${PROJECT_NAME}_VERSION}")
 # Dependencies
 # ============
 
-set(xtensor_REQUIRED_VERSION 0.23.0)
+set(xtensor_REQUIRED_VERSION 0.24.0)
 if(TARGET xtensor)
     set(xtensor_VERSION
         ${XTENSOR_VERSION_MAJOR}.${XTENSOR_VERSION_MINOR}.${XTENSOR_VERSION_PATCH})
diff --git a/README.md b/README.md
index 5c38fc0..93a90c0 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ make install
 
 | `zarray` | `xtensor` | `nlohmann_json` |
 |----------|-----------|-----------------|
-|  master  |  0.23.8   |  3.2.0          |
+|  master  |  0.24.0   |  3.2.0          |
 |  0.1.0   |  0.23.8   |  3.2.0          |
 |  0.0.6   |  0.23.8   |  3.2.0          |
 
diff --git a/environment-dev.yml b/environment-dev.yml
index 0ea6b34..49e1780 100644
--- a/environment-dev.yml
+++ b/environment-dev.yml
@@ -3,8 +3,8 @@ channels:
   - conda-forge
 dependencies:
   - cmake
-  - xtensor=0.23.8
-  - xtensor-io=0.12.2
-  - xsimd=7.4.8
+  - xtensor=0.24.0
+  - xtensor-io=0.13.0
+  - xsimd=8.0.3
   - nlohmann_json=3.2.0
-  - doctest
\ No newline at end of file
+  - doctest

From de110496a397a4e315ecd7d9d9c2a1673d89e2f7 Mon Sep 17 00:00:00 2001
From: Johan Mabille <johan.mabille@gmail.com>
Date: Wed, 20 Oct 2021 17:20:02 +0200
Subject: [PATCH 2/2] Fixed azure CI

---
 .azure-pipelines/azure-pipelines-linux-clang.yml | 6 +-----
 .azure-pipelines/azure-pipelines-linux-gcc.yml   | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.azure-pipelines/azure-pipelines-linux-clang.yml b/.azure-pipelines/azure-pipelines-linux-clang.yml
index 60630f4..c3eadc2 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:
@@ -18,7 +14,7 @@ jobs:
           llvm_version: '10'
           disable_xsimd: 1
     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 af0dc0c..886b1de 100644
--- a/.azure-pipelines/azure-pipelines-linux-gcc.yml
+++ b/.azure-pipelines/azure-pipelines-linux-gcc.yml
@@ -2,13 +2,9 @@ jobs:
   - job: 'Linux_1'
     strategy:
       matrix:
-        gcc_4:
-          gcc_version: '4.9'
-        gcc_5_disable_xsimd:
-          gcc_version: '5'
-          disable_xsimd: 1
         gcc_6:
           gcc_version: '6'
+          disable_xsimd: 1
         gcc_7:
           gcc_version: '7'
         gcc_8:
@@ -19,7 +15,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)