Skip to content

Commit

Permalink
Bump version to 1.2, update change log
Browse files Browse the repository at this point in the history
  • Loading branch information
aradi committed Dec 9, 2021
1 parent b32d4cc commit d35cdca
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
===

Expand All @@ -30,5 +41,5 @@ Changed

* The Fypp-preprocessor is not shipped with MpiFx but is an external
requirement.

* Name convention for processes (master -> lead).
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.2.0
2 changes: 1 addition & 1 deletion doc/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 1 addition & 4 deletions utils/srcmanip/set_version
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand All @@ -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}')
]


Expand Down

0 comments on commit d35cdca

Please sign in to comment.