Merge pull request #829 from SyneRBI/pre_3.5.0

Update version_config.cmake and others files for release
SyneRBI · Aug 13, 2023 · bfc474a · bfc474a
2 parents b2437d3 + 90ac4a4
commit bfc474a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,7 @@
 # ChangeLog
 
-## vx.x.x
+## v3.5.0
+- Temporarily disable CCPi-Regularisation due to #832
 - docker image updates
    - introduce `REMOVE_BUILD_FILES` variable. If set to 1 (which is the default),
      most build files will be removed in the docker image.
@@ -17,6 +18,7 @@
   - range-v3: 0.12.0
   - siemens_to_ismrmrd: 8bb8b08f53ce73c2de9ba5f47f1532f96292d92b
   - ISMRMRD: v1.13.2
+  - SIRF: v3.5.0
 
 ## v3.4.0
 - Removed CIL-ASTRA as it has been merged into CIL code base.

diff --git a/SuperBuild.cmake b/SuperBuild.cmake
@@ -317,7 +317,7 @@ if ("${PYTHON_STRATEGY}" STREQUAL "CONDA")
   set (BUILD_CIL OFF)
 endif()
 if (BUILD_CIL)
-  list(APPEND ${PRIMARY_PROJECT_NAME}_DEPENDENCIES CIL CCPi-Regularisation-Toolkit TomoPhantom)
+  list(APPEND ${PRIMARY_PROJECT_NAME}_DEPENDENCIES CIL TomoPhantom)
 endif()
 if (BUILD_ASTRA)
   list(APPEND ${PRIMARY_PROJECT_NAME}_DEPENDENCIES astra-python-wrapper)

diff --git a/SuperBuild/External_CIL.cmake b/SuperBuild/External_CIL.cmake
@@ -116,9 +116,6 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
   add_test(NAME CIL_FRAMEWORK_TESTS_9
            COMMAND ${PYTHON_EXECUTABLE} -m unittest discover -p test_Operator.py
            WORKING_DIRECTORY ${${proj}_SOURCE_DIR}/Wrappers/Python/test)
-  add_test(NAME CIL_FRAMEWORK_TESTS_10
-           COMMAND ${PYTHON_EXECUTABLE} -m unittest discover -p test_PluginsRegularisation.py
-           WORKING_DIRECTORY ${${proj}_SOURCE_DIR}/Wrappers/Python/test)
   add_test(NAME CIL_FRAMEWORK_TESTS_11
            COMMAND ${PYTHON_EXECUTABLE} -m unittest discover -p test_quality_measures.py
            WORKING_DIRECTORY ${${proj}_SOURCE_DIR}/Wrappers/Python/test)

diff --git a/VirtualBox/VM_version.txt b/VirtualBox/VM_version.txt
@@ -1 +1 @@
-3.4.0
+3.5.0
diff --git a/VirtualBox/vagrant/Vagrantfile b/VirtualBox/vagrant/Vagrantfile
@@ -74,7 +74,7 @@ Vagrant.configure("2") do |config|
        "--medium", "emptydrive"
        ]
 
-	vb.name = ENV["VB_NAME"] || "SIRF 3.4.0"
+	vb.name = ENV["VB_NAME"] || "SIRF 3.5.0"
     vb.customize ["modifyvm", :id, 
 	          "--clipboard", "bidirectional",
                   '--graphicscontroller', 'vmsvga',

diff --git a/version_config.cmake b/version_config.cmake
@@ -219,7 +219,7 @@ if (DEVEL_BUILD)
 
 
 else()
-  set(DEFAULT_SIRF_TAG v3.4.0)
+  set(DEFAULT_SIRF_TAG v3.5.0)
 
   ## STIR
   set(DEFAULT_STIR_URL https://github.com/UCL/STIR )