Merge pull request #248 from JohanMabille/upgrade

JohanMabille · web-flow · commit 5f9d261471b4 · 2021-01-20T18:31:48.000+01:00
Upgraded to xtensor 0.22.0
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -22,7 +22,7 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install cmake -c conda-forge
-  - conda install pytest numpy pybind11==2.4.3 xtensor==0.21.4 -c conda-forge
+  - conda install pytest numpy pybind11==2.4.3 xtensor==0.22.0 -c conda-forge
   - "set PYTHONHOME=%MINICONDA%"
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe -DDOWNLOAD_GTEST=ON .
   - nmake test_xtensor_python
diff --git a/README.md b/README.md
@@ -195,7 +195,7 @@ from the `docs` subdirectory.
 
 | `xtensor-python` | `xtensor` |  `pybind11`      |
 |------------------|-----------|------------------|
-| master           |  ^0.21.2  | ~2.4.3           |
+| master           |  ^0.22.0  | ~2.4.3           |
 | 0.24.1           |  ^0.21.2  | ~2.4.3           |
 | 0.24.0           |  ^0.21.1  | ~2.4.3           |
 | 0.23.2           |  ^0.20.10 | ~2.4.3           |
diff --git a/environment-dev.yml b/environment-dev.yml
@@ -5,7 +5,7 @@ dependencies:
   # Build dependencies
   - cmake
   # Host dependencies
-  - xtensor=0.21.4
+  - xtensor=0.22.0
   - numpy
   - pybind11=2.4.3
   # Test dependencies
