Skip to content

Commit

Permalink
Pre-release update for v21.1.0 (#1511)
Browse files Browse the repository at this point in the history
* Update changelog

* Update readme

* build variants
  • Loading branch information
gfardell authored Sep 29, 2023
1 parent 9d6b4d5 commit fb95d17
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
22 changes: 9 additions & 13 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit fb95d17

Please sign in to comment.