Merge branch 'master' into 2716_transform_interface_bug

.github/workflows/linkcheck.yml

@@ -4,7 +4,8 @@ jobs:
   check-links:
     if: ${{ github.repository != 'stfc/PSyclone-mirror' }}
     name: Run linkspector
-    runs-on: ubuntu-latest
+    # TODO 2838: linkspector doesn't support ubuntu-latest at the moment.
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Run linkspector

.github/workflows/python-package.yml

@@ -1,7 +1,7 @@
 # -----------------------------------------------------------------------------
 # BSD 3-Clause License
 #
-# Copyright (c) 2020-2024, Science and Technology Facilities Council.
+# Copyright (c) 2020-2025, Science and Technology Facilities Council.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
 # Modified by A. J. Voysey, Met Office
 # Modified by J. Henrichs, Bureau of Meteorology
 # Modified by N. Nobre, STFC Daresbury Lab
+# Modified by A. B. G. Chalk, STFC Daresbury Lab
 
 # This workflow will install Python dependencies, run tests and lint with a
 # variety of Python versions.
@@ -103,7 +104,8 @@ jobs:
     - run: cd doc/developer_guide; make html; make doctest
   build:
     if: ${{ github.repository != 'stfc/PSyclone-mirror' }}
-    runs-on: ubuntu-latest
+    # TODO 2837: Switch to ubuntu-latest once Python 3.7 support is removed.
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python-version: [3.7, 3.8, 3.13]

README.md

@@ -2,7 +2,7 @@
   <img width="460" src="doc/logo/psyclone_v1.0.png">
 </p>
 
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11190458.svg)](https://doi.org/10.5281/zenodo.11190458)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11190457.svg)](https://doi.org/10.5281/zenodo.11190457)
 ![Build Status](https://github.com/stfc/PSyclone/workflows/PSyclone%20tests%20and%20examples/badge.svg)
 [![codecov](https://codecov.io/gh/stfc/PSyclone/branch/master/graph/badge.svg)](https://codecov.io/gh/stfc/PSyclone)
 

changelog

@@ -1,3 +1,21 @@
+	1) PR #2827. Update Zenodo with release 3.0.0 and update link in
+	README.md.
+
+	2) PR #2759 for #2758. Fixes failure seen in compilation tests if
+	a previous build of infrastructure existed.
+
+	3) PR #2807 for #2806. Adds a new 'RESOLVE_IMPORTS' global variable
+	to transformation scripts which allows the user to instruct the
+	frontend to chase down some (or all) module imports when constructing
+	the PSyIR for existing code.
+
+	4) PR #2821 for #1247. Adds support for parsing comments from the fparser2
+	AST tree. There are two new FortranReader arguments to select the behaviour
+	for comments and directives (by default they are not parsed).
+
+	5) PR #2836 for #2835. Reverts GHA to use Ubuntu 22.04 as python-3.7
+	not available in ubuntu-latest and linkspector is also broken.
+
 release 3.0.0 6th of December 2024
 
 	1) PR #2477 for #2463. Add support for Fortran Namelist statements.

doc/developer_guide/psyir.rst

@@ -898,7 +898,7 @@ class, for example:
 
 .. code-block:: python
 
-    from psyclone.psyir.nodes.commentable_mixin import CommentableMixin
+    from psyclone.psyir.commentable_mixin import CommentableMixin
 
     class MyNode(Node, CommentableMixin):
         ''' Example node '''