Merge pull request #36 from davidbrochart/update_deps

Update dependencies
xtensor-stack · Mar 23, 2021 · c95264b · c95264b
2 parents dd9be1b + cbfcfe8
commit c95264b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/.azure-pipelines/unix-build.yml b/.azure-pipelines/unix-build.yml
@@ -15,6 +15,11 @@ steps:
     condition: eq('${{ parameters.platform }}', 'Linux')
     displayName: Install conda-forge compilers
 
+  - script: |
+      source activate xtensor-zarr
+      conda install tbb==2020.2 -c conda-forge
+    displayName: Workaround missing TBB
+
   - script: |
       source activate xtensor-zarr
       export LDFLAGS="${LDFLAGS} -Wl,-rpath,$CONDA_PREFIX/lib"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,10 +34,10 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/cmake")
 set(nlohmann_json_REQUIRED_VERSION "3.2.0" )
 find_package(nlohmann_json ${nlohmann_json_REQUIRED_VERSION} REQUIRED)
 
-set(xtensor_io_REQUIRED_VERSION "0.12.0")
+set(xtensor_io_REQUIRED_VERSION "0.12.4")
 find_package(xtensor-io ${xtensor_io_REQUIRED_VERSION} REQUIRED)
 
-set(zarray_REQUIRED_VERSION "0.0.3")
+set(zarray_REQUIRED_VERSION "0.0.5")
 find_package(zarray ${zarray_REQUIRED_VERSION} REQUIRED)
 
 #Remove the following lines when xtensor-io is fixed

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -9,8 +9,8 @@ dependencies:
   - jupyterlab_widgets=1.0.0
   - ffmpeg=4.3.1  # openimageio is being added as a runtime requirement to xtensor-io
   - widgetsnbextension
-  - xtensor-io=0.12.1
-  - zarray=0.0.3
+  - xtensor-io=0.12.4
+  - zarray=0.0.5
   - cppcolormap=1.3.0
   - bash_kernel
   - nlohmann_json

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -10,9 +10,9 @@ dependencies:
   - aws-sdk-cpp
   - cpp-filesystem
   - zlib
-  - xtensor-io=0.12.1
+  - xtensor-io=0.12.4
   - gdal
-  - zarray=0.0.3
+  - zarray=0.0.5
   # Test dependencies
   - fsspec
   - numpy