diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ea88e4ce1..349e90a9c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -* x.x.x +* 23.1.0 - Fix bug in IndicatorBox proximal_conjugate - Allow CCPi Regulariser functions for non CIL object - Add norm for CompositionOperator diff --git a/README.md b/README.md index a3ed88f8c5..dc8d5d1ca4 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,13 @@ 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=23.0.1 +conda create --name cil -c conda-forge -c intel -c ccpi cil=23.1.0 ``` 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 ccpi cil=23.0.1 astra-toolbox tigre ccpi-regulariser tomophantom "ipywidgets<8" +conda create --name cil -c conda-forge -c intel -c ccpi cil=23.1.0 astra-toolbox tigre ccpi-regulariser tomophantom "ipywidgets<8" ``` where, diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index cd7d480cef..2ba2a05f82 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -22,18 +22,16 @@ python: - 3.8 - 3.9 - - 3.10 + - 3.10 - 3.8 - 3.9 - - 3.10 + - 3.10 - 3.8 - 3.9 - - 3.10 - # - 3.11 - # - 3.8 - # - 3.9 - # - 3.10 - # - 3.11 + - 3.10 + - 3.8 + - 3.9 + - 3.10 numpy: - 1.21 - 1.21 @@ -44,11 +42,9 @@ numpy: - 1.23 - 1.23 - 1.23 - # - 1.23 - # - 1.24 - # - 1.24 - # - 1.24 - # - 1.24 + - 1.24 + - 1.24 + - 1.24 zip_keys: - python - numpy