371 fab transmute support

applications/skeleton/fab_skeleton.py

@@ -16,8 +16,9 @@
 import logging
 from pathlib import Path
 import sys
+from typing import Optional, Union
 
-from fab.steps.grab.folder import grab_folder
+from fab.api import grab_files
 
 # We need to import the base class:
 sys.path.insert(0, str(Path(__file__).parents[2] / "lfric_build"))
@@ -35,10 +36,13 @@ class FabSkeleton(PfUnitMixin, LFRicBase):
     :param name: The name of the application.
     """
 
-    def __init__(self, name: str = "skeleton") -> None:
+    def __init__(self,
+                 name: str = "skeleton",
+                 root_symbol: Optional[Union[list[str], str]] = None) -> None:
 
         app_dir = Path(__file__).parent
-        super().__init__(name=name, app_dir=app_dir)
+        super().__init__(name=name, app_dir=app_dir,
+                         root_symbol=root_symbol)
         # Store the root of this apps for later
         this_file = Path(__file__).resolve()
         self._this_root = this_file.parent
@@ -48,12 +52,12 @@ def grab_files_step(self) -> None:
         Grabs the required source files and optimisation scripts.
         """
         super().grab_files_step()
-        grab_folder(self.config, src=self.app_dir / "source",
-                    dst_label='')
+        grab_files(self.config, src=self.app_dir / "source",
+                   dst_label='')
 
         # Copy the optimisation scripts into a separate directory
-        grab_folder(self.config, src=self._this_root / "optimisation",
-                    dst_label='optimisation')
+        grab_files(self.config, src=self._this_root / "optimisation",
+                   dst_label='optimisation')
 
     def get_rose_meta(self) -> Path:
         """
@@ -65,7 +69,6 @@ def get_rose_meta(self) -> Path:
 
 # -----------------------------------------------------------------------------
 if __name__ == '__main__':
-
     logger = logging.getLogger('fab')
     logger.setLevel(logging.DEBUG)
     fab_skeleton = FabSkeleton()

lfric_build/pfunit_mixin.py

@@ -16,7 +16,7 @@
 from pathlib import Path
 from typing import List, Optional, Iterable, Union
 
-from fab.api import (ArtefactSet, Category, Exclude, grab_folder, Include,
+from fab.api import (ArtefactSet, Category, Exclude, grab_files, Include,
                      input_to_output_fpath, step)
 
 
@@ -94,8 +94,8 @@ def grab_files_step(self) -> None:
         unit_test = "unit-test"
         # Check if there are unit tests
         if (not self.args.no_test) and (self.app_dir / unit_test).is_dir():
-            grab_folder(self.config, src=self.app_dir / unit_test,
-                        dst_label=unit_test)
+            grab_files(self.config, src=self.app_dir / unit_test,
+                       dst_label=unit_test)
             # Some tests also need the .f90 files from
             # components/science/unit-tests, but not the .pf files. So, only
             # pick the directories that contain f90 files (picking all files,
@@ -112,9 +112,9 @@ def grab_files_step(self) -> None:
                 # this when rsync-ing `a` and `a/b` you end up with duplicated
                 # files).
                 dst = path.relative_to(core_test_dir)
-                grab_folder(self.config,
-                            src=path,
-                            dst_label=unit_test / dst)
+                grab_files(self.config,
+                           src=path,
+                           dst_label=unit_test / dst)
 
             self._has_test = True