Skip to content

Commit

Permalink
Update dependencies (#41)
Browse files Browse the repository at this point in the history
* Update dependencies

* Use mamba in the CI
  • Loading branch information
davidbrochart committed Apr 20, 2021
1 parent 484f98b commit b5d568c
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
7 changes: 4 additions & 3 deletions .azure-pipelines/unix-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ steps:
- script: |
conda config --set always_yes yes --set changeps1 no
conda update -q conda
conda env create --file environment-dev.yml
conda install mamba -c conda-forge
mamba env create --file environment-dev.yml
displayName: Install dependencies
- script: |
source activate xtensor-zarr
conda install gxx_linux-64 libgcc -c conda-forge
mamba install gxx_linux-64 libgcc -c conda-forge
condition: eq('${{ parameters.platform }}', 'Linux')
displayName: Install conda-forge compilers
- script: |
source activate xtensor-zarr
conda install tbb==2020.2 -c conda-forge
mamba install tbb==2020.2 -c conda-forge
displayName: Workaround missing TBB
- script: |
Expand Down
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@ 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.4")
set(xtensor_REQUIRED_VERSION "0.23.7")
find_package(xtensor-io ${xtensor_io_REQUIRED_VERSION} REQUIRED)

set(zarray_REQUIRED_VERSION "0.0.5")
set(xtensor_io_REQUIRED_VERSION "0.12.6")
find_package(xtensor-io ${xtensor_io_REQUIRED_VERSION} REQUIRED)

set(zarray_REQUIRED_VERSION "0.0.6")
find_package(zarray ${zarray_REQUIRED_VERSION} REQUIRED)

#Remove the following lines when xtensor-io is fixed
Expand Down
5 changes: 3 additions & 2 deletions binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ 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.4
- zarray=0.0.5
- xtensor=0.23.7
- xtensor-io=0.12.6
- zarray=0.0.6
- cppcolormap=1.3.0
- bash_kernel
- nlohmann_json
Expand Down
6 changes: 3 additions & 3 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ dependencies:
- aws-sdk-cpp
- cpp-filesystem
- zlib
- xtensor-io=0.12.4
- xtensor=0.23.4
- xtensor=0.23.7
- xtensor-io=0.12.6
- gdal
- zarray=0.0.5
- zarray=0.0.6
# Test dependencies
- fsspec
- numpy
Expand Down
4 changes: 2 additions & 2 deletions test/downloadGTest.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ project(googletest-download NONE)

include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG v1.10.x
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 ""
Expand Down

0 comments on commit b5d568c

Please sign in to comment.