From b056f9615b7c7b834eb14cae10c57aa77deed8d6 Mon Sep 17 00:00:00 2001 From: Christian Blau Date: Thu, 7 Jan 2021 07:51:56 +0000 Subject: [PATCH] Prepare for GROMACS 2020.6 Reset DOI strings. Prepare release note stubs. Set patch number in build infrastructure. --- cmake/gmxVersionInfo.cmake | 6 +++--- docs/CMakeLists.txt | 3 ++- docs/release-notes/2020/2020.6.rst | 24 ++++++++++++++++++++++++ docs/release-notes/index.rst | 1 + 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 docs/release-notes/2020/2020.6.rst diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake index 9e88d810d1..e1e5a5ecf6 100644 --- a/cmake/gmxVersionInfo.cmake +++ b/cmake/gmxVersionInfo.cmake @@ -196,7 +196,7 @@ # The GROMACS convention is that these are the version number of the next # release that is going to be made from this branch. set(GMX_VERSION_MAJOR 2020) -set(GMX_VERSION_PATCH 5) +set(GMX_VERSION_PATCH 6) # The suffix, on the other hand, is used mainly for betas and release # candidates, where it signifies the most recent such release from # this branch; it will be empty before the first such release, as well @@ -283,8 +283,8 @@ if (GMX_VERSION_STRING_OF_FORK) set(GMX_MANUAL_DOI_INTERNAL "") set(GMX_SOURCE_DOI_INTERNAL "") else() - set(GMX_MANUAL_DOI_INTERNAL "10.5281/zenodo.4420784") # Set correct doi string here - set(GMX_SOURCE_DOI_INTERNAL "10.5281/zenodo.4420785") # Set correct doi string here + set(GMX_MANUAL_DOI_INTERNAL "") # Set correct doi string here + set(GMX_SOURCE_DOI_INTERNAL "") # Set correct doi string here endif() set(GMX_MANUAL_DOI ${GMX_MANUAL_DOI_INTERNAL} CACHE INTERNAL "reserved doi for GROMACS manual" FORCE) set(GMX_SOURCE_DOI ${GMX_SOURCE_DOI_INTERNAL} CACHE INTERNAL "reserved doi for GROMACS source code" FORCE) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 52af462e04..0416cbab63 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -1,7 +1,7 @@ # # This file is part of the GROMACS molecular simulation package. # -# Copyright (c) 2014,2015,2016,2017,2018,2019,2020, by the GROMACS development team, led by +# Copyright (c) 2014,2015,2016,2017,2018,2019,2020,2021, by the GROMACS development team, led by # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl, # and including many others, as listed in the AUTHORS file in the # top-level source directory and at http://www.gromacs.org. @@ -366,6 +366,7 @@ if (SPHINX_FOUND) release-notes/2020/2020.3.rst release-notes/2020/2020.4.rst release-notes/2020/2020.5.rst + release-notes/2020/2020.6.rst release-notes/2020/major/highlights.rst release-notes/2020/major/features.rst release-notes/2020/major/performance.rst diff --git a/docs/release-notes/2020/2020.6.rst b/docs/release-notes/2020/2020.6.rst new file mode 100644 index 0000000000..7a00bf163a --- /dev/null +++ b/docs/release-notes/2020/2020.6.rst @@ -0,0 +1,24 @@ +GROMACS 2020.6 release notes +---------------------------- + +This version was released on TODO, 2021. These release notes +document the changes that have taken place in GROMACS since the +previous 2020.5 version, to fix known issues. + +.. Note to developers! + Please use """"""" to underline the individual entries for fixed issues in the subfolders, + otherwise the formatting on the webpage is messed up. + Also, please use the syntax :issue:`number` to reference issues on redmine, without the + a space between the colon and number! + +Fixes where mdrun could behave incorrectly +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Fixes for ``gmx`` tools +^^^^^^^^^^^^^^^^^^^^^^^ + +Fixes that affect portability +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Miscellaneous +^^^^^^^^^^^^^ diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst index e7de4da185..45433f4c82 100644 --- a/docs/release-notes/index.rst +++ b/docs/release-notes/index.rst @@ -29,6 +29,7 @@ Patch releases .. toctree:: :maxdepth: 1 + 2020/2020.6 2020/2020.5 2020/2020.4 2020/2020.3 -- 2.22.0