Merge v1.6.0 release candidate branch '1.6.0-rc1'

cyclus · May 4, 2024 · afebcf5 · afebcf5
2 parents 35adbce + 68c223c
commit afebcf5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,21 @@
 cycamore Change Log
 =================
 
-.. current developments
+Since last release
+======================
+
+**Added:**
+
+**Changed:**
+
+**Fixed:**
+
+**Removed:**
+
+
+v1.6.0
+====================
+
 **Added:**
 
 * Downstream testing in CI workflows (#573, #580, #582, #583)
@@ -48,8 +62,6 @@ v1.5.4
 - All cycamore archetypes have been edited to now include Cyclus::toolkit::Position.
 
 
-
-
 v1.5.3
 ====================
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 ENDIF()
 
 # This project name is cycamore.
-PROJECT(CYCAMORE VERSION 1.5.5)
+PROJECT(CYCAMORE VERSION 1.6.0)
 
 # check for and enable c++11 support (required for cyclus)
 INCLUDE(CheckCXXCompilerFlag)

diff --git a/DEPENDENCIES.rst b/DEPENDENCIES.rst
@@ -20,7 +20,7 @@ Dependencies
 ====================   ==================
 Package                Minimum Version
 ====================   ==================
-`Cyclus`               1.5
+`Cyclus`               1.6
 ====================   ==================
 
 

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -17,7 +17,7 @@ Cycamore's only dependency is the Cyclus Core.
 ====================   ==================
 Package                Minimum Version
 ====================   ==================
-`Cyclus`               1.5
+`Cyclus`               1.6
 ====================   ==================
 
 There are a number of ways to install the Cyclus core: