Merge pull request #1002 from SyneRBI/release-3.10.0

Author: casperdcl

CHANGES.md

@@ -8,21 +8,23 @@
   - re-enable `BUILD_CIL`
   - `ctest --verbose`
   - move CIL-related depdendencies to conda (#993)
-    + CCPi-Regularisation-Toolkit
-    + astra-toolbox
-    + TomoPhantom
+    - CCPi-Regularisation-Toolkit
+    - astra-toolbox
+    - TomoPhantom
+- docker image updates:
   - `STIR_DISABLE_HDF5=ON`
   - `USE_SYSTEM_HDF5=OFF`
-  - docker `USE_SYSTEM_BOOST=ON`
+  - `USE_SYSTEM_BOOST=ON`
 - Updated versions:
   - SIRF-Contribs: v3.9.1
   - SIRF: 6e429c2d1862057086720c543d220730feb3eecb (2026-05-12)
   - STIR: 6.4.0
   - TomoPhantom: 3.1.4
-  - parallelproj: 2.0.5
+  - parallelproj: 2.0.6
   - CMake: 3.31.12
   - TIGRE: 3.1.3
   - CUDA: 12.9.2
+  - CIL: 2d03882d4348409f810b2161574e70bb2aac82fe (2026-06-11)
 
 ## v3.9.0
 - VM: set the matplotlib backend to tkagg

VirtualBox/VM_version.txt

@@ -1 +1 @@
-3.8.0
+3.10.0

VirtualBox/vagrant/Vagrantfile

@@ -74,7 +74,7 @@ Vagrant.configure("2") do |config|
        "--medium", "emptydrive"
        ]
 
-	vb.name = ENV["VB_NAME"] || "SIRF 3.8.0"
+	vb.name = ENV["VB_NAME"] || "SIRF 3.10.0"
     vb.customize ["modifyvm", :id, 
 	          "--clipboard", "bidirectional",
                   '--graphicscontroller', 'vmsvga',

version_config.cmake

@@ -127,7 +127,7 @@ set(DEFAULT_NiftyPET_TAG 70b97da0a4eea9445e34831f7393947a37bc77e7)
 
 ## parallelproj
 set(DEFAULT_parallelproj_URL https://github.com/KUL-recon-lab/libparallelproj)
-set(DEFAULT_parallelproj_TAG v2.0.5)
+set(DEFAULT_parallelproj_TAG v2.0.6)
 
 ## STIR
 # SIRF might work with STIR 6.3.0, but that version has a bug
@@ -158,7 +158,7 @@ set(DEFAULT_JSON_TAG v3.11.3)
 
 # CCPi CIL
 set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL)
-set(DEFAULT_CIL_TAG "numpy-2")
+set(DEFAULT_CIL_TAG "2d03882d4348409f810b2161574e70bb2aac82fe")
 
 # CERN ROOT
 set(DEFAULT_ROOT_URL https://github.com/root-project/root)
@@ -211,7 +211,7 @@ if (DEVEL_BUILD)
 
   # CCPi CIL
   set(DEFAULT_CIL_URL https://github.com/TomographicImaging/CIL)
-  set(DEFAULT_CIL_TAG origin/numpy-2)
+  set(DEFAULT_CIL_TAG origin/master)
 
   # Gadgetron
   # set(DEFAULT_Gadgetron_TAG origin/master)