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

cyclus · May 4, 2024 · 39063ff · 39063ff
2 parents ff37df4 + 34e2df8
commit 39063ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,6 +7,18 @@ Since last release
 
 **Added:**
 
+**Changed:**
+
+**Removed:**
+
+**Fixed:**
+
+
+v1.6.0
+====================
+
+**Added:**
+
 * adding compatibility with cbc 2.10 (#1557)
 * In `src/pyne.h`, replace a macro `isnan()` with `using std::isnan`, 
   as the former has led to undesired macro expansion in Boost header files. (#1560)

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 cyclus.
-PROJECT(CYCLUS VERSION 1.5.5)
+PROJECT(CYCLUS VERSION 1.6.0)
 
 # check for and enable c++17 support (required for cyclus)
 INCLUDE(CheckCXXCompilerFlag)

diff --git a/DEPENDENCIES.rst b/DEPENDENCIES.rst
@@ -43,6 +43,7 @@ And a few optional dependencies:
 ====================   ==================  =============================================  ==================        
 Package                Minimum Version     Purpose                                        Notes
 ====================   ==================  =============================================  ==================  
+``git``                2.32.0              Enables access to source code via Github       N/A
 ``Coin-Cbc``           2.10.3              Enables use of Branch-and-Cut solver           Cyclus must be built with ``--allow-milps`` flag
 ``Coin-Clp``           1.17.5              Enables use of Linear Programming solver       Cyclus must be built with ``--allow-milps`` flag
 ``doxygen``            1.7.6.1             Building documentation                         N/A