Update to fparser 0.2.4

.github/workflows/compilation.yml

@@ -87,7 +87,7 @@ jobs:
         python -m pip install --upgrade pip
         # Uncomment the below to use the submodule version of fparser rather
         # than the latest release from pypi.
-        pip install external/fparser
+        # pip install external/fparser
         pip install .[test,psydata,doc,treesitter]
     - name: Unit tests with compilation - gfortran
       run: |

.github/workflows/extraction_test.yml

@@ -74,7 +74,7 @@ jobs:
         python -m pip install --upgrade pip
         # Uncomment the below to use the submodule version of fparser rather
         # than the latest release from pypi.
-        pip install external/fparser
+        # pip install external/fparser
         pip install .[test]
         # Install BAF, and its version of Fab:
         # ------------------------------------

.github/workflows/lfric_test.yml

@@ -85,7 +85,7 @@ jobs:
         python -m pip install --upgrade pip
         # Uncomment the below to use the submodule version of fparser rather
         # than the latest release from pypi.
-        pip install external/fparser
+        # pip install external/fparser
         pip install .[test]
         # Fetch the specified version of LFRic apps
         cd /archive/psyclone-tests/latest-run

.github/workflows/nemo_tests.yml

@@ -86,7 +86,7 @@ jobs:
         python -m pip install --upgrade pip
         # Uncomment the below to use the submodule version of fparser rather
         # than the latest release from pypi.
-        pip install external/fparser
+        # pip install external/fparser
         pip install .[test]
         # Compile nvidia profiling tools
         module load nvidia-hpcsdk/${NVFORTRAN_VERSION}

.github/workflows/nemo_v5_tests.yml

@@ -83,7 +83,7 @@ jobs:
         python -m pip install --upgrade pip
         # Uncomment the below to use the submodule version of fparser rather
         # than the latest release from pypi.
-        pip install external/fparser
+        # pip install external/fparser
         pip install .
     - name: Reset working directory
       run: |

.github/workflows/python-package.yml

@@ -63,12 +63,27 @@ jobs:
       GITHUB_PR_NUMBER: ${{ github.event.number }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          # This is required to get the commit history for merge commits for
+          # the ci-skip check below.
+          fetch-depth: '0'
+      - name: Check for [skip ci] in commit message
+        uses: mstachniuk/ci-skip@v1
+        with:
+          # This setting causes the tests to 'fail' if [skip ci] is specified
+          fail-fast: true
+          commit-filter: '[skip ci]'
       - uses: actions/setup-python@v5
         with:
           python-version: '3.14'
       - run: sudo apt-get install -y graphviz doxygen
       - run: python -m pip install --upgrade pip
-      - run: pip install .[doc]
+      - run: |
+          # Uncomment the below to use the submodule version of fparser rather
+          # than the latest release from pypi.
+          # pip install external/fparser
+          pip install .[doc]
       # Now we can check for warnings and broken links
       - run: cd doc; make html SPHINXOPTS="-W --keep-going"
       - run: cd doc; make linkcheck
@@ -102,10 +117,10 @@ jobs:
           python -m pip install --upgrade pip
           # Some of the examples use Jupyter.
           pip install jupyter
-          # We need to install sphinx to get correct doc testing
           # Uncomment the below to use the submodule version of fparser rather
           # than the latest release from pypi.
           # pip install external/fparser
+          # We need to install sphinx to get correct doc testing
           pip install .[doc]
           pip install .[test,treesitter]
       - name: Lint with flake8

pyproject.toml

@@ -66,7 +66,7 @@ classifiers = [
 ]
 dependencies = [
     "pyparsing",
-    "fparser==0.2.2",
+    "fparser==0.2.4",
     "configparser",
     "sympy",
     "Jinja2",

src/psyclone/tests/psyad/domain/lfric/test_lfric_adjoint.py

@@ -123,9 +123,9 @@ def test_generate_lfric_adjoint_no_routines_error(fortran_reader):
 
 MULTI_ROUTINE_CODE = (
     f"module test_mod\n"
-    f"  implicit none\n"
     f"  use kernel_mod\n"
     f"  use argument_mod\n"
+    f"  implicit none\n"
     f"{METADATA}"
     f"  public test_code\n"
     f"  interface test_code\n"
@@ -187,9 +187,9 @@ def test_generate_lfric_adjoint_multi_routine_logging(fortran_reader, caplog):
 
 SINGLE_ROUTINE_CODE = (
     "module test_mod\n"
-    "  implicit none\n"
     "  use kernel_mod\n"
     "  use argument_mod\n"
+    "  implicit none\n"
     "  type, extends(kernel_type) :: test_type\n"
     "     type(arg_type), dimension(2) :: meta_args = (/  &\n"
     "          arg_type(gh_field,  gh_real, gh_inc, w0),  &\n"

src/psyclone/tests/psyir/frontend/fparser2_where_handler_test.py

@@ -914,8 +914,8 @@ def test_import_in_where_clause(fortran_reader):
     '''
     code = '''
     program where_test
-    implicit none
     use some_module, only: a, b, c, d
+    implicit none
 
     where(a(:) + b > 1)
        b = c + d
@@ -927,8 +927,8 @@ def test_import_in_where_clause(fortran_reader):
 
     code2 = '''
     program where_test
-    implicit none
     use some_module, only: c, d
+    implicit none
     integer, dimension(100) :: a, b
 
     where(a(:) + b > 1)

src/psyclone/tests/psyir/nodes/codeblock_test.py

@@ -186,11 +186,11 @@ def test_codeblock_get_fortran_lines():
     frontends)
     '''
     code = "\nsubroutine mytest\nend subroutine"
-    tree = Fparser2Reader().generate_parse_tree_from_source(code)
+    tree = Fparser2Reader(free_form=True).generate_parse_tree_from_source(code)
     block = Fparser2CodeBlock(tree.children, CodeBlock.Structure.STATEMENT)
     assert isinstance(block.get_fortran_lines(), list)
-    assert "subroutine mytest" in block.get_fortran_lines()
-    assert "end subroutine" in block.get_fortran_lines()
+    assert "SUBROUTINE mytest" in block.get_fortran_lines()
+    assert "END SUBROUTINE" in block.get_fortran_lines()
 
     tree = FortranTreeSitterReader().generate_parse_tree_from_source(code)
     block = TreeSitterCodeBlock(tree, CodeBlock.Structure.STATEMENT)