Merge branch 'master' into 2636_nlevels_per_kernel

stfc · Sep 4, 2024 · 98ba987 · 98ba987
2 parents cff828e + 92fbf60
commit 98ba987
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/changelog b/changelog
@@ -211,6 +211,8 @@
 	72) PR #2675 towards #1351. Refactors the LFRic metadata checking and
 	adds support for user-supplied kernels that operate on dofs.
 
+	73) PR #2700 for #2699. Fix docstring error for Config class.
+
 release 2.5.0 14th of February 2024
 
 	1) PR #2199 for #2189. Fix bugs with missing maps in enter data

diff --git a/psyclone.pdf b/psyclone.pdf
diff --git a/src/psyclone/configuration.py b/src/psyclone/configuration.py
@@ -173,8 +173,9 @@ def __init__(self):
         and stub APIs, it does not load a config file. The Config instance
         is a singleton, and as such will test that no instance already exists
         and raise an exception otherwise.
-        :raises GenerationError: If a singleton instance of Config already \
-                exists.
+
+        :raises ConfigurationError: If a singleton instance of Config already
+                                    exists.
         '''
 
         if Config._instance is not None: