Merge branch 'master' into trivial-operators-documentation

TomographicImaging · Oct 21, 2024 · f675126 · f675126
2 parents a4f2604 + 662bad3
commit f675126
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
   - Fix bug with 'median' and 'mean' methods in Masker averaging over the wrong axes.
 - Enhancements:
   - Removed multiple exits from numba implementation of KullbackLeibler divergence (#1901)
+- Dependencies:
+  - Added scikit-image to CIL-Demos conda install command as needed for new Callbacks notebook.
 
 * 24.2.0
   - New Features:

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ conda create --name cil -c conda-forge -c https://software.repos.intel.com/pytho
 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:
 
 ```sh
-conda create --name cil -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi cil=24.2.0 astra-toolbox=*=cuda* tigre ccpi-regulariser tomophantom ipykernel ipywidgets
+conda create --name cil -c conda-forge -c https://software.repos.intel.com/python/conda -c ccpi cil=24.2.0 astra-toolbox=*=cuda* tigre ccpi-regulariser tomophantom ipykernel ipywidgets scikit-image
 ```
 
 where: