bump ccpi-regulariser

TomographicImaging · Apr 16, 2024 · fdc7a54 · fdc7a54
1 parent bdc55dd
commit fdc7a54
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ where:
 
 - `astra-toolbox` (requires an NVIDIA GPU) enables CIL support for [ASTRA toolbox](http://www.astra-toolbox.com) projectors (GPLv3 license)
 - `tigre` (requires an NVIDIA GPU) enables support for [TIGRE](https://github.com/CERN/TIGRE) toolbox projectors (BSD license)
-- `ccpi-regulariser` is the [CCPi Regularisation Toolkit](https://github.com/vais-ral/CCPi-Regularisation-Toolkit)
+- `ccpi-regulariser` is the [CCPi Regularisation Toolkit](https://github.com/TomographicImaging/CCPi-Regularisation-Toolkit)
 - `tomophantom` can generate phantoms to use as test data [Tomophantom](https://github.com/dkazanc/TomoPhantom)
 
 ### Dependencies

diff --git a/Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py b/Wrappers/Python/cil/plugins/ccpi_regularisation/functions/regularisers.py
@@ -20,7 +20,7 @@
     from ccpi.filters import regularisers
     from ccpi.filters.TV import TV_ENERGY
 except ImportError as exc:
-    raise ImportError('Please `conda install "ccpi::ccpi-regulariser>=20.04"`') from exc
+    raise ImportError('Please `conda install "ccpi::ccpi-regulariser>=24"`') from exc
 
 
 from cil.framework import DataOrder

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -38,7 +38,7 @@ test:
     - tomophantom=2.0.0       # [ linux ]
     - tigre=2.4               # [ not osx ]
     - packaging
-    - ccpi-regulariser=22.0.0 # [ not osx ]
+    - ccpi-regulariser=24.0.0 # [ not osx ]
     - astra-toolbox>=1.9.9.dev5,<2.1
 
   source_files:
@@ -93,7 +93,7 @@ requirements:
     - tomophantom=2.0.0
     - astra-toolbox>=1.9.9.dev5,<2.1
     - tigre=2.4
-    - ccpi-regulariser=22.0.0
+    - ccpi-regulariser=24.0.0
     - ipywidgets <8
 
 about:

diff --git a/scripts/create_local_env_for_cil_development.sh b/scripts/create_local_env_for_cil_development.sh
@@ -75,7 +75,7 @@ if test $test_deps = 0; then
 else
   conda_args+=(
     astra-toolbox'>=1.9.9.dev5,<2.1'
-    ccpi-regulariser=22.0.0
+    ccpi-regulariser=24.0.0
     cil-data
     cvxpy
     ipywidgets

diff --git a/scripts/requirements-test.yml b/scripts/requirements-test.yml
@@ -23,7 +23,7 @@ dependencies:
   - numpy=1.24
   - cil-data
   - tigre=2.4
-  - ccpi-regulariser=22.0.0
+  - ccpi-regulariser=24.0.0
   - tomophantom=2.0.0
   - astra-toolbox >=1.9.9.dev5,<2.1
   - cvxpy