Merge pull request #1761 from stfc/1760_release_2.3.1

(Towards #1760) release 2.3.1
stfc · Jun 16, 2022 · 7992612 · 7992612
2 parents 8b7e238 + 563ee13
commit 7992612
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/changelog b/changelog
@@ -4,6 +4,8 @@
 
 	3) PR #1745 towards #1731. Split PSyLoop class from Loop node.
 
+	4) PR #1761 for #1760. Create release 2.3.1
+
 release 2.3.0 9th June 2022
 
 	1) PR #1672. Fixes BOZ literal standard incompatibility in the

diff --git a/doc/reference_guide/doxygen.config b/doc/reference_guide/doxygen.config
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Reference Guide"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.3.0
+PROJECT_NUMBER         = 2.3.1
 
 # 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 a

diff --git a/doc/reference_guide/source/conf.py b/doc/reference_guide/source/conf.py
@@ -28,7 +28,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '2.3.0'
+release = '2.3.1'
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/external/fparser b/external/fparser
diff --git a/psyclone.pdf b/psyclone.pdf
diff --git a/setup.py b/setup.py
@@ -159,7 +159,7 @@ def get_files(directory, install_path, valid_suffixes):
         package_dir={"": "src"},
         # TODO #1193: Pinned jsonschema to support older versions of python
         # TODO #1507: remove dependence on 'six'
-        install_requires=['pyparsing', 'fparser==0.0.15', 'configparser',
+        install_requires=['pyparsing', 'fparser==0.0.16', 'configparser',
                           'six', 'jsonschema==3.0.2', 'sympy'],
         extras_require={
             'dag': ["graphviz"],

diff --git a/src/psyclone/version.py b/src/psyclone/version.py
@@ -39,7 +39,7 @@
 
 __MAJOR__ = 2
 __MINOR__ = 3
-__MICRO__ = 0
+__MICRO__ = 1
 
 __SHORT_VERSION__ = "{0:d}.{1:d}".format(__MAJOR__, __MINOR__)
 __VERSION__ = "{0:d}.{1:d}.{2:d}".format(__MAJOR__, __MINOR__, __MICRO__)
+11 −0		CHANGELOG.md
+3 −1		README.md
+2 −2		doc/conf.py
+2 −2		setup.py
+39 −10		src/fparser/common/splitline.py
+65 −5		src/fparser/two/Fortran2003.py
+45 −16		src/fparser/two/symbol_table.py
+141 −0		src/fparser/two/tests/fortran2003/test_associate_construct_r816.py
+35 −1		src/fparser/two/tests/fortran2003/test_block_do_construct_r826.py
+72 −1		src/fparser/two/tests/fortran2003/test_case_construct_r808.py
+74 −1		src/fparser/two/tests/fortran2003/test_if_construct_r802.py
+128 −0		src/fparser/two/tests/fortran2003/test_select_type_construct_r821.py
+74 −1		src/fparser/two/tests/fortran2003/test_where_construct_r744.py
+0 −55		src/fparser/two/tests/test_fortran2003.py
+24 −3		src/fparser/two/tests/test_symbol_table.py
+8 −1		src/fparser/two/tests/test_symbol_tables.py
+93 −48		src/fparser/two/utils.py