From: Paul Bauer Date: Mon, 11 Nov 2019 12:03:52 +0000 (+0100) Subject: Change version for master X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=351ae077f93bafcaef81bcb9210e7040c03d7bd9;p=alexxy%2Fgromacs.git Change version for master Also adds dummy documentation and sets the regressiontest label back to master from release-2020. Change-Id: Ib2186f944ecebdcb3910d240a8e6446eec85fb5d --- diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake index f34389fe3b..8f0b1a0ab6 100644 --- a/cmake/gmxVersionInfo.cmake +++ b/cmake/gmxVersionInfo.cmake @@ -58,6 +58,7 @@ # GROMACS 2018 3 # GROMACS 2019 4 # GROMACS 2020 5 +# GROMACS 2021 6 # LIBRARY_SOVERSION_MINOR so minor version for the built libraries. # Should be increased for each release that changes only the implementation. # In GROMACS, the typical policy is to increase it for each patch version @@ -195,13 +196,13 @@ # 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_MAJOR 2021) set(GMX_VERSION_PATCH 0) # 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 # as after the final release is out. -set(GMX_VERSION_SUFFIX "-beta2") +set(GMX_VERSION_SUFFIX "") # Conventionally with libtool, any ABI change must change the major # version number, the minor version number should change if it's just @@ -212,7 +213,7 @@ set(GMX_VERSION_SUFFIX "-beta2") # here. The important thing is to minimize the chance of third-party # code being able to dynamically link with a version of libgromacs # that might not work. -set(LIBRARY_SOVERSION_MAJOR 5) +set(LIBRARY_SOVERSION_MAJOR 6) set(LIBRARY_SOVERSION_MINOR 0) set(LIBRARY_VERSION ${LIBRARY_SOVERSION_MAJOR}.${LIBRARY_SOVERSION_MINOR}.0) @@ -254,7 +255,7 @@ if (NOT SOURCE_IS_SOURCE_DISTRIBUTION AND endif() set(REGRESSIONTEST_VERSION "${GMX_VERSION_STRING}") -set(REGRESSIONTEST_BRANCH "refs/heads/release-2020") +set(REGRESSIONTEST_BRANCH "refs/heads/master") # Run the regressiontests packaging job with the correct pakage # version string, and the release box checked, in order to have it # build the regressiontests tarball with all the right naming. The diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 4806664fda..165de1a686 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -361,6 +361,15 @@ if (SPHINX_FOUND) how-to/visualize.rst install-guide/index.rst release-notes/index.rst + release-notes/2021/major/highlights.rst + release-notes/2021/major/features.rst + release-notes/2021/major/performance.rst + release-notes/2021/major/tools.rst + release-notes/2021/major/bugs-fixed.rst + release-notes/2021/major/removed-functionality.rst + release-notes/2021/major/deprecated-functionality.rst + release-notes/2021/major/portability.rst + release-notes/2021/major/miscellaneous.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/2021/major/bugs-fixed.rst b/docs/release-notes/2021/major/bugs-fixed.rst new file mode 100644 index 0000000000..1db0c1eb08 --- /dev/null +++ b/docs/release-notes/2021/major/bugs-fixed.rst @@ -0,0 +1,9 @@ +Bugs fixed +^^^^^^^^^^ + +.. 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! + diff --git a/docs/release-notes/2021/major/deprecated-functionality.rst b/docs/release-notes/2021/major/deprecated-functionality.rst new file mode 100644 index 0000000000..bf6860025c --- /dev/null +++ b/docs/release-notes/2021/major/deprecated-functionality.rst @@ -0,0 +1,14 @@ +.. _anticipated-changes: + +.. 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! + +Changes anticipated to |Gromacs| 2021 functionality +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Functionality deprecated in |Gromacs| 2021 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + diff --git a/docs/release-notes/2021/major/features.rst b/docs/release-notes/2021/major/features.rst new file mode 100644 index 0000000000..4fab02b117 --- /dev/null +++ b/docs/release-notes/2021/major/features.rst @@ -0,0 +1,9 @@ +New and improved features +^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. 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! + diff --git a/docs/release-notes/2021/major/highlights.rst b/docs/release-notes/2021/major/highlights.rst new file mode 100644 index 0000000000..3bcb16d34a --- /dev/null +++ b/docs/release-notes/2021/major/highlights.rst @@ -0,0 +1,22 @@ +Highlights +^^^^^^^^^^ + +|Gromacs| 2021 was released on INSERT DATE HERE. Patch releases may +have been made since then, please use the updated versions! Here are +some highlights of what you can expect, along with more detail in the +links below! + +As always, we've got several useful performance improvements, with or +without GPUs, all enabled and automated by default. In addition, +several new features are available for running simulations. We are extremely +interested in your feedback on how well the new release works on your +simulations and hardware. The new features are: + +* Cool quote autogenerator + + +.. 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! diff --git a/docs/release-notes/2021/major/miscellaneous.rst b/docs/release-notes/2021/major/miscellaneous.rst new file mode 100644 index 0000000000..96513fa4c8 --- /dev/null +++ b/docs/release-notes/2021/major/miscellaneous.rst @@ -0,0 +1,9 @@ +Miscellaneous +^^^^^^^^^^^^^ + +.. 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! + diff --git a/docs/release-notes/2021/major/performance.rst b/docs/release-notes/2021/major/performance.rst new file mode 100644 index 0000000000..0a72678f80 --- /dev/null +++ b/docs/release-notes/2021/major/performance.rst @@ -0,0 +1,9 @@ +Performance improvements +^^^^^^^^^^^^^^^^^^^^^^^^ + +.. 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! + diff --git a/docs/release-notes/2021/major/portability.rst b/docs/release-notes/2021/major/portability.rst new file mode 100644 index 0000000000..48bba8a282 --- /dev/null +++ b/docs/release-notes/2021/major/portability.rst @@ -0,0 +1,9 @@ +Portability +^^^^^^^^^^^ + +.. 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! + diff --git a/docs/release-notes/2021/major/removed-functionality.rst b/docs/release-notes/2021/major/removed-functionality.rst new file mode 100644 index 0000000000..e6a64590bf --- /dev/null +++ b/docs/release-notes/2021/major/removed-functionality.rst @@ -0,0 +1,9 @@ +Removed functionality +^^^^^^^^^^^^^^^^^^^^^ + +.. 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! + diff --git a/docs/release-notes/2021/major/tools.rst b/docs/release-notes/2021/major/tools.rst new file mode 100644 index 0000000000..3451957b9c --- /dev/null +++ b/docs/release-notes/2021/major/tools.rst @@ -0,0 +1,9 @@ +Improvements to |Gromacs| tools +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. 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! + diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst index a14cf5ef7f..0d88616682 100644 --- a/docs/release-notes/index.rst +++ b/docs/release-notes/index.rst @@ -8,18 +8,38 @@ releases of |Gromacs|. Major releases contain changes to the functionality supported, whereas patch releases contain only fixes for issues identified in the corresponding major releases. -Two versions of |Gromacs| are under active maintenance, the 2020 -series and the 2019 series. In the latter, only highly conservative +Two versions of |Gromacs| are under active maintenance, the 2021 +series and the 2020 series. In the latter, only highly conservative fixes will be made, and only to address issues that affect scientific correctness. Naturally, some of those releases will be made after the -year 2019 ends, but we keep 2018 in the name so users understand how +year 2020 ends, but we keep 2019 in the name so users understand how up to date their version is. Such fixes will also be incorporated into -the 2020 release series, as appropriate. Around the time the 2021 -release is made, the 2019 series will no longer be maintained. +the 2021 release series, as appropriate. Around the time the 2022 +release is made, the 2020 series will no longer be maintained. Where issue numbers are reported in these release notes, more details can be found at https://redmine.gromacs.org at that issue number. +|Gromacs| 2021 series +--------------------- + +Major release +^^^^^^^^^^^^^ + +.. toctree:: + :maxdepth: 1 + + 2021/major/highlights + 2021/major/features + 2021/major/performance + 2021/major/tools + 2021/major/bugs-fixed + 2021/major/deprecated-functionality + 2021/major/removed-functionality + 2021/major/portability + 2021/major/miscellaneous + + |Gromacs| 2020 series ---------------------