From d35cdca02628c9ca993b8592a78ce4bf91bbccd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20Aradi?= Date: Thu, 9 Dec 2021 17:27:36 +0100 Subject: [PATCH] Bump version to 1.2, update change log --- CHANGELOG.rst | 13 ++++++++++++- VERSION | 2 +- doc/doxygen/Doxyfile | 2 +- doc/sphinx/conf.py | 4 ++-- utils/srcmanip/set_version | 5 +---- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9c00206..cac490b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,17 @@ Change Log Notable project changes in various releases. +1.2 +=== + +Added +----- + +* Support for building with meson + +* Support to build with GNU Fortran >= 11 + + 1.1 === @@ -30,5 +41,5 @@ Changed * The Fypp-preprocessor is not shipped with MpiFx but is an external requirement. - + * Name convention for processes (master -> lead). diff --git a/VERSION b/VERSION index 9084fa2..26aaba0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0 +1.2.0 diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 045fac5..0439a1e 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = "MpiFx" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "1.1" +PROJECT_NUMBER = "1.2.0" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py index 35addeb..4ec24c2 100644 --- a/doc/sphinx/conf.py +++ b/doc/sphinx/conf.py @@ -45,10 +45,10 @@ # built documents. # # The short X.Y version. -version = '1.1' +version = '1.2' # The full version, including alpha/beta/rc tags. -release = '1.1' +release = '1.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/utils/srcmanip/set_version b/utils/srcmanip/set_version index b2888d2..00be0d0 100755 --- a/utils/srcmanip/set_version +++ b/utils/srcmanip/set_version @@ -15,10 +15,6 @@ _VERSION_PATTERN = r'\d+\.\d+(?:\.\d+)?(?:-\w+)?' _FILES_AND_PATTERNS = [ # - ('CMakeLists.txt', - r'project\(\s*MpiFx\s+VERSION\s+{}(\s+|\))'.format(_VERSION_PATTERN), - r'project(MpiFx VERSION {version}\1'), - # ('doc/doxygen/Doxyfile', r'^PROJECT_NUMBER\s*=\s*([\'"]){}\1\s*$'.format(_VERSION_PATTERN), 'PROJECT_NUMBER = "{version}"\n'), @@ -30,6 +26,7 @@ _FILES_AND_PATTERNS = [ ('doc/sphinx/conf.py', r'release\s*=\s*([\'"]){}\1'.format(_VERSION_PATTERN), "release = '{version}'"), + ('VERSION', _VERSION_PATTERN, '{version}') ]