Prepare branch for 2021.2 point release

Reset DOI strings.
Set new version.
Add release note stub.

diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake
index 3ac0d306093add7e269fd92a31bd9185b889d21e..ae89ba427f40d97c3a7ed13326d4f1385ef3e84f 100644 (file)
--- a/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@ -198,7 +198,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 2021)
-set(GMX_VERSION_PATCH 1)
+set(GMX_VERSION_PATCH 2)
 # 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
@@ -285,8 +285,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.4561625") # Set correct doi string here
-    set(GMX_SOURCE_DOI_INTERNAL "10.5281/zenodo.4561626") # 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 5e97749915f3a3e104df5825f4f15fc058fc9c05..d103a3454ef5ff3e07f3f7f6d3c6757296edc564 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -364,6 +364,7 @@ if (SPHINX_FOUND)
         how-to/visualize.rst
         install-guide/index.rst
         release-notes/index.rst
+        release-notes/2021/2021.2.rst
         release-notes/2021/2021.1.rst
         release-notes/2021/major/highlights.rst
         release-notes/2021/major/features.rst

diff --git a/docs/release-notes/2021/2021.2.rst b/docs/release-notes/2021/2021.2.rst
new file mode 100644 (file)
index 0000000..31b3294
--- /dev/null
+++ b/docs/release-notes/2021/2021.2.rst
@@ -0,0 +1,26 @@
+GROMACS 2021.2 release notes
+----------------------------
+
+This version was released on TODO, 2021. These release notes
+document the changes that have taken place in GROMACS since the
+previous 2021.1 version, to fix known issues. It also incorporates all
+fixes made in version 2020.6 and earlier, which you can find described
+in the :ref:`release-notes`.
+
+.. 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 GitLab, 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 52879e5d79941fbb00ef5a16268910259a97d1be..b015d015a1aa324d086c2c34075f1813640f42cc 100644 (file)
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -31,6 +31,7 @@ Patch releases
 .. toctree::
    :maxdepth: 1
 
+   2021/2021.2
    2021/2021.1