From 6edf48aee6e1dcf81a933d4d57dea661509fcba3 Mon Sep 17 00:00:00 2001 From: Gemma Fardell <47746591+gfardell@users.noreply.github.com> Date: Thu, 6 Jan 2022 14:05:33 +0000 Subject: [PATCH] updated matplotlib dependency (#1110) --- CHANGELOG.md | 1 + README.md | 4 ++-- recipe/meta.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14711df453..2685fded0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ * 21.3.1 + - Added matplotlib version dependency to conda recipe - Fixed TIGRE wrappers for geometry with a virtual detector - Fixed TIGRE wrappers for cone-beam geometry with tilted rotation axis diff --git a/README.md b/README.md index 2877dd4846..502e22a3a9 100644 --- a/README.md +++ b/README.md @@ -22,14 +22,14 @@ The documentation for CIL can be accessed [here](https://tomographicimaging.gith Binary installation of CIL can be done with `conda`. Install a new environment using: ```bash -conda create --name cil -c conda-forge -c intel -c ccpi cil matplotlib=3.4.3 +conda create --name cil -c conda-forge -c intel -c ccpi cil ``` To install CIL and the additional packages and plugins needed to run the [CIL demos](https://github.com/TomographicImaging/CIL-Demos) install the environment with: ```bash -conda create --name cil -c conda-forge -c intel -c astra-toolbox/label/dev -c ccpi cil cil-astra ccpi-regulariser tigre tomophantom=1.4.10 cudatoolkit=9.2 matplotlib=3.4.3 +conda create --name cil -c conda-forge -c intel -c astra-toolbox/label/dev -c ccpi cil cil-astra ccpi-regulariser tigre tomophantom=1.4.10 ``` where, diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a10a3097b3..bf8307917c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,7 +56,7 @@ requirements: - python - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }} - scipy >=1.4.0 - - matplotlib >=3.3.0 + - matplotlib >=3.3.0,<3.5 - h5py - pillow - libgcc-ng # [linux]