sci-fab 2.0__tar.gz → 2.2.0__tar.gz

sci_fab-2.2.0/CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+# Code of Conduct
+
+All contributors to Fab must follow the
+[Met Office Simulation Systems Code of Conduct](https://metoffice.github.io/simulation-systems/FurtherDetails/code_of_conduct).

sci_fab-2.0/LICENSE → sci_fab-2.2.0/LICENCE

@@ -1,4 +1,4 @@
-BSD 3-Clause License
+BSD 3-Clause Licence
 
 Copyright (c) 2019, Met Office Modelling Infrastructure Support Systems
 All rights reserved.

{sci_fab-2.0 → sci_fab-2.2.0}/PKG-INFO

@@ -1,38 +1,8 @@
 Metadata-Version: 2.4
 Name: sci-fab
-Version: 2.0
+Version: 2.2.0
 Summary: Build system for scientific software
 Author-email: Core Capabilities Development Team <CoreCapabilityDevelopmentTeam@metoffice.gov.uk>
-License: BSD 3-Clause License
-        
-        Copyright (c) 2019, Met Office Modelling Infrastructure Support Systems
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this
-           list of conditions and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice,
-           this list of conditions and the following disclaimer in the documentation
-           and/or other materials provided with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its
-           contributors may be used to endorse or promote products derived from
-           this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
 Project-URL: homepage, https://github.com/MetOffice/fab
 Project-URL: documentation, https://MetOffice.github.io/fab
 Project-URL: repository, https://github.com/MetOffice/fab
@@ -46,7 +16,7 @@ Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Build Tools
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/x-rst
-License-File: LICENSE
+License-File: LICENCE
 Requires-Dist: fparser>=0.2
 Provides-Extra: c-language
 Requires-Dist: libclang; extra == "c-language"
@@ -68,10 +38,16 @@ Requires-Dist: flake8>=5.0.4; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Dynamic: license-file
 
-# Fab - A Build System for Tomorrow
+Fab - A Build System for Tomorrow
+=================================
 
-[![Build](https://github.com/MetOffice/fab/actions/workflows/build.yml/badge.svg)](https://github.com/MetOffice/fab/actions/workflows/build.yml)
-[![Build Documentation](https://github.com/MetOffice/fab/actions/workflows/documentation.yml/badge.svg)](https://github.com/MetOffice/fab/actions/workflows/documentation.yml)
+.. image:: https://github.com/MetOffice/fab/actions/workflows/build.yml/badge.svg
+   :target: https://github.com/MetOffice/fab/actions/workflows/build.yml
+   :alt: testing
+
+.. image:: https://github.com/MetOffice/fab/actions/workflows/documentation.yml/badge.svg
+   :target: https://github.com/MetOffice/fab/actions/workflows/documentation.yml
+   :alt: documentation
 
 The "Fab" project aims to provide the means to quickly and easily compile
 software in a way tailored for scientific software development. It aims to be
@@ -83,15 +59,18 @@ application software. It targets different problems to, for instance, CMake
 derived build systems. This means that if your usage falls outside the focus
 of development you shouldn't expect high priority on your feature requests.
 
-## Licence
+Licence
+~~~~~~~
 
 The software is made available under a 3-clause BSD licence.
 
-## Installation
+Installation
+~~~~~~~~~~~~
 
 The tool is easily installed using `pip install sci-fab`.
 
-## Usage
+Usage
+~~~~~
 
 Fab offers two modes of operation. In "zero configuration" mode it is used
 directly as a tool by running `fab`. This examines the currently selected

sci_fab-2.0/README.md → sci_fab-2.2.0/README.rst

@@ -1,7 +1,13 @@
-# Fab - A Build System for Tomorrow
+Fab - A Build System for Tomorrow
+=================================
 
-[![Build](https://github.com/MetOffice/fab/actions/workflows/build.yml/badge.svg)](https://github.com/MetOffice/fab/actions/workflows/build.yml)
-[![Build Documentation](https://github.com/MetOffice/fab/actions/workflows/documentation.yml/badge.svg)](https://github.com/MetOffice/fab/actions/workflows/documentation.yml)
+.. image:: https://github.com/MetOffice/fab/actions/workflows/build.yml/badge.svg
+   :target: https://github.com/MetOffice/fab/actions/workflows/build.yml
+   :alt: testing
+
+.. image:: https://github.com/MetOffice/fab/actions/workflows/documentation.yml/badge.svg
+   :target: https://github.com/MetOffice/fab/actions/workflows/documentation.yml
+   :alt: documentation
 
 The "Fab" project aims to provide the means to quickly and easily compile
 software in a way tailored for scientific software development. It aims to be
@@ -13,15 +19,18 @@ application software. It targets different problems to, for instance, CMake
 derived build systems. This means that if your usage falls outside the focus
 of development you shouldn't expect high priority on your feature requests.
 
-## Licence
+Licence
+~~~~~~~
 
 The software is made available under a 3-clause BSD licence.
 
-## Installation
+Installation
+~~~~~~~~~~~~
 
 The tool is easily installed using `pip install sci-fab`.
 
-## Usage
+Usage
+~~~~~
 
 Fab offers two modes of operation. In "zero configuration" mode it is used
 directly as a tool by running `fab`. This examines the currently selected

{sci_fab-2.0 → sci_fab-2.2.0}/pyproject.toml

@@ -1,3 +1,7 @@
+[build-system]
+requires = ['setuptools']
+build-backend = 'setuptools.build_meta'
+
 [project]
 name = "sci-fab"
 description = "Build system for scientific software"
@@ -51,13 +55,9 @@ repository = 'https://github.com/MetOffice/fab'
 where = ['source']
 
 [tool.setuptools.dynamic]
-readme = {file = 'README.md'}
+readme = {file = 'README.rst', content-type = "text/x-rst"}
 version = {attr = 'fab.__version__'}
 
-[build-system]
-requires = ['setuptools']
-build-backend = 'setuptools.build_meta'
-
 # This is required so that pytest finds conftest.py files.
 [tool.pytest.ini_options]
 testpaths = [

{sci_fab-2.0 → sci_fab-2.2.0}/source/fab/__init__.py

@@ -10,7 +10,7 @@ Flexible build system for scientific software.
 import logging
 import sys
 
-__version__ = '2.0'
+__version__ = '2.2.0'
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.StreamHandler(sys.stdout))

sci_fab-2.2.0/source/fab/api.py

@@ -0,0 +1,95 @@
+"""
+This module allows any application to import all required
+functions from fab to be imported independent of the location of the
+files using `from fab.api import ...`.
+"""
+
+# TODO #518: allow versioned APIs, and make this file point to the
+# current default API version.
+
+from fab.artefacts import ArtefactSet, CollectionGetter
+from fab.artefacts import SuffixFilter
+from fab.build_config import AddFlags, BuildConfig
+from fab.fab_base.fab_base import FabBase
+from fab.steps import run_mp
+from fab.steps import step
+from fab.steps.analyse import analyse
+from fab.steps.archive_objects import archive_objects
+from fab.steps.c_pragma_injector import c_pragma_injector
+from fab.steps.cleanup_prebuilds import cleanup_prebuilds
+from fab.steps.compile_c import compile_c
+from fab.steps.compile_fortran import compile_fortran
+from fab.steps.find_source_files import Exclude, find_source_files, Include
+from fab.steps.grab.fcm import fcm_export
+from fab.steps.grab.folder import grab_folder
+from fab.steps.grab.git import git_checkout
+from fab.steps.grab.prebuild import grab_pre_build
+from fab.steps.link import link_exe, link_shared_object
+from fab.steps.preprocess import preprocess_c, preprocess_fortran
+from fab.steps.psyclone import preprocess_x90, psyclone
+from fab.steps.root_inc_files import root_inc_files
+from fab.tools.category import Category
+from fab.tools.compiler import Compiler, Ifort
+from fab.tools.compiler_wrapper import CompilerWrapper
+from fab.tools.flags import AlwaysFlags, ContainFlags, FlagList, MatchFlags
+from fab.tools.linker import Linker
+from fab.tools.pkg_config import PkgConfig
+from fab.tools.tool import Tool
+from fab.tools.tool_box import ToolBox
+from fab.tools.tool_repository import ToolRepository
+from fab.tools.shell import Shell
+from fab.util import common_arg_parser
+from fab.util import file_checksum, log_or_dot, TimerLogger
+from fab.util import get_fab_workspace
+from fab.util import input_to_output_fpath
+
+__all__ = [
+    "AddFlags",
+    "AlwaysFlags",
+    "analyse",
+    "archive_objects",
+    "ArtefactSet",
+    "BuildConfig",
+    "Category",
+    "cleanup_prebuilds",
+    "CollectionGetter",
+    "common_arg_parser",
+    "Compiler",
+    "CompilerWrapper",
+    "compile_c",
+    "compile_fortran",
+    "ContainFlags",
+    "c_pragma_injector",
+    "Exclude",
+    "FabBase",
+    "fcm_export",
+    "file_checksum",
+    "FlagList",
+    "get_fab_workspace",
+    "git_checkout",
+    "grab_folder",
+    "grab_pre_build",
+    "find_source_files",
+    "Ifort",
+    "Include",
+    "input_to_output_fpath",
+    "Linker",
+    "link_exe",
+    "link_shared_object",
+    "log_or_dot",
+    "MatchFlags",
+    "PkgConfig",
+    "preprocess_c",
+    "preprocess_fortran",
+    "preprocess_x90",
+    "psyclone",
+    "root_inc_files",
+    "run_mp",
+    "Shell",
+    "step",
+    "SuffixFilter",
+    "TimerLogger",
+    "Tool",
+    "ToolBox",
+    "ToolRepository",
+    ]

{sci_fab-2.0 → sci_fab-2.2.0}/source/fab/artefacts.py

@@ -18,7 +18,7 @@ from abc import ABC, abstractmethod
 from collections import defaultdict
 from enum import auto, Enum
 from pathlib import Path
-from typing import Dict, Iterable, List, Optional, Union
+from typing import Iterable, Optional, Union
 
 from fab.dep_tree import filter_source_tree, AnalysedDependent
 from fab.util import suffix_filter
@@ -27,12 +27,12 @@ from fab.util import suffix_filter
 class ArtefactSet(Enum):
     '''A simple enum with the artefact types used internally in Fab.
     '''
-    INITIAL_SOURCE = auto()
+    INITIAL_SOURCE_FILES = auto()
     PREPROCESSED_FORTRAN = auto()
     PREPROCESSED_C = auto()
-    FORTRAN_BUILD_FILES = auto()
-    C_BUILD_FILES = auto()
-    X90_BUILD_FILES = auto()
+    FORTRAN_COMPILER_FILES = auto()
+    C_COMPILER_FILES = auto()
+    X90_COMPILER_FILES = auto()
     CURRENT_PREBUILDS = auto()
     PRAGMAD_C = auto()
     BUILD_TREES = auto()
@@ -98,7 +98,7 @@ class ArtefactStore(dict):
 
     def copy_artefacts(self, source: Union[str, ArtefactSet],
                        dest: Union[str, ArtefactSet],
-                       suffixes: Optional[Union[str, List[str]]] = None):
+                       suffixes: Optional[Union[str, list[str]]] = None):
         '''Copies all artefacts from `source` to `destination`. If a
         suffix_fiter is specified, only files with the given suffix
         will be copied.
@@ -115,8 +115,8 @@ class ArtefactStore(dict):
             self.add(dest, self[source])
 
     def replace(self, artefact: Union[str, ArtefactSet],
-                remove_files: List[Union[str, Path]],
-                add_files: Union[List[Union[str, Path]], dict]):
+                remove_files: list[Union[str, Path]],
+                add_files: Union[list[Union[str, Path]], dict]):
         '''Replaces artefacts in one artefact set with other artefacts. This
         can be used e.g to replace files that have been preprocessed
         and renamed. There is no requirement for these lists to have the
@@ -190,7 +190,7 @@ class CollectionConcat(ArtefactsGetter):
         DEFAULT_SOURCE_GETTER = CollectionConcat([
             'preprocessed_c',
             'preprocessed_fortran',
-            SuffixFilter(ArtefactSet.INITIAL_SOURCE, '.f90'),
+            SuffixFilter(ArtefactSet.INITIAL_SOURCE_FILES, '.f90'),
         ])
 
     """
@@ -225,12 +225,12 @@ class SuffixFilter(ArtefactsGetter):
     Example::
 
         # The default source getter for the FortranPreProcessor step.
-        DEFAULT_SOURCE = SuffixFilter(ArtefactSet.INITIAL_SOURCE, '.F90')
+        DEFAULT_SOURCE = SuffixFilter(ArtefactSet.INITIAL_SOURCE_FILES, '.F90')
 
     """
     def __init__(self,
                  collection_name: Union[str, ArtefactSet],
-                 suffix: Union[str, List[str]]):
+                 suffix: Union[str, list[str]]):
         """
         :param collection_name:
             The name of the artefact collection.
@@ -258,10 +258,10 @@ class FilterBuildTrees(ArtefactsGetter):
         DEFAULT_SOURCE_GETTER = FilterBuildTrees(suffix='.f90')
 
     :returns: one list of files to compile per build tree, of the form
-        Dict[name, List[AnalysedDependent]]
+        Dict[name, list[AnalysedDependent]]
 
     """
-    def __init__(self, suffix: Union[str, List[str]]):
+    def __init__(self, suffix: Union[str, list[str]]):
         """
         :param suffix:
             A suffix string, or iterable of, including the preceding dot.
@@ -273,7 +273,7 @@ class FilterBuildTrees(ArtefactsGetter):
 
         build_trees = artefact_store[ArtefactSet.BUILD_TREES]
 
-        build_lists: Dict[str, List[AnalysedDependent]] = {}
+        build_lists: dict[str, list[AnalysedDependent]] = {}
         for root, tree in build_trees.items():
             build_lists[root] = filter_source_tree(source_tree=tree,
                                                    suffixes=self.suffixes)

{sci_fab-2.0 → sci_fab-2.2.0}/source/fab/build_config.py

@@ -18,14 +18,14 @@ from logging.handlers import RotatingFileHandler
 from multiprocessing import cpu_count
 from pathlib import Path
 from string import Template
-from typing import List, Optional, Iterable
+from typing import Optional, Iterable
 
 from fab.artefacts import ArtefactSet, ArtefactStore
 from fab.constants import BUILD_OUTPUT, SOURCE_ROOT, PREBUILD
 from fab.metrics import (send_metric, init_metrics, stop_metrics,
                          metrics_summary)
 from fab.tools.category import Category
-from fab.tools.tool_box import ToolBox
+from fab.tools.abstract_tool_box import AbstractToolBox
 from fab.steps.cleanup_prebuilds import CLEANUP_COUNT, cleanup_prebuilds
 from fab.util import TimerLogger, by_type, get_fab_workspace
 
@@ -41,7 +41,7 @@ class BuildConfig():
 
     """
     def __init__(self, project_label: str,
-                 tool_box: ToolBox,
+                 tool_box: AbstractToolBox,
                  mpi: bool = False,
                  openmp: bool = False,
                  profile: Optional[str] = None,
@@ -91,9 +91,9 @@ class BuildConfig():
         self._openmp = openmp
         if profile is None:
             # An empty string is used for non-profiled flags
-            self._profile = ""
+            self.set_profile("")
         else:
-            self._profile = profile
+            self.set_profile(profile)
         self.two_stage = two_stage
         self.verbose = verbose
         compiler = tool_box.get_tool(Category.FORTRAN_COMPILER, mpi=mpi,
@@ -186,7 +186,7 @@ class BuildConfig():
         self._finalise_logging()
 
     @property
-    def tool_box(self) -> ToolBox:
+    def tool_box(self) -> AbstractToolBox:
         ''':returns: the tool box to use.'''
         return self._tool_box
 
@@ -223,6 +223,13 @@ class BuildConfig():
         ''':returns: the name of the compiler profile to use.'''
         return self._profile
 
+    def set_profile(self, profile: str) -> None:
+        """Sets the compilation profile.
+
+        :param profile: the name of the profile.
+        """
+        self._profile = profile.lower()
+
     def add_current_prebuilds(self, artefacts: Iterable[Path]):
         """
         Mark the given file paths as being current prebuilds, not to be
@@ -288,13 +295,19 @@ class BuildConfig():
 
 
 # todo: better name? perhaps PathFlags?
+# todo: This is going to be replaced with tools.flags.MatchFlags
+
 class AddFlags():
     """
     Add command-line flags when our path filter matches.
-    Generally used inside a :class:`~fab.build_config.FlagsConfig`.
+    This class is deprecated, use the new
+    :class:`~fab.tools.flags.FlagList` and
+    :class:`~fab.tools.flags.MatchFlag` instead.
+    The compile and preprocess steps will convert AddFlags into
+    MatchFlags
 
     """
-    def __init__(self, match: str, flags: List[str]):
+    def __init__(self, match: str, flags: list[str]):
         """
         :param match:
             The string to match against each file path.
@@ -318,11 +331,11 @@ class AddFlags():
 
         """
         self.match: str = match
-        self.flags: List[str] = flags
+        self.flags: list[str] = flags
 
     # todo: we don't need the project_workspace, we could just pass in the
     # output folder
-    def run(self, fpath: Path, input_flags: List[str], config):
+    def run(self, fpath: Path, input_flags: list[str], config):
         """
         Check if our filter matches a given file. If it does, add our flags.
 
@@ -347,48 +360,3 @@ class AddFlags():
 
             # add our flags
             input_flags += add_flags
-
-
-class FlagsConfig():
-    """
-    Return command-line flags for a given path.
-
-    Simply allows appending flags but may evolve to also replace and
-    remove flags.
-
-    """
-    def __init__(self, common_flags: Optional[List[str]] = None,
-                 path_flags: Optional[List[AddFlags]] = None):
-        """
-        :param common_flags:
-            List of flags to apply to all files. E.g `['-O2']`.
-        :param path_flags:
-            List of :class:`~fab.build_config.AddFlags` objects which apply
-            flags to selected paths.
-
-        """
-        self.common_flags = common_flags or []
-        self.path_flags = path_flags or []
-
-    # todo: there's templating both in this method and the run method it calls.
-    #       make sure it's all properly documented and rationalised.
-    def flags_for_path(self, path: Path, config):
-        """
-        Get all the flags for a given file, in a reproducible order.
-
-        :param path:
-            The file path for which we want command-line flags.
-        :param config:
-            The config contains the source root and project workspace.
-
-        """
-        # We COULD make the user pass these template params to the constructor
-        # but we have a design requirement to minimise the config burden on
-        # the user, so we take care of it for them here instead.
-        params = {'source': config.source_root, 'output': config.build_output}
-        flags = [Template(i).substitute(params) for i in self.common_flags]
-
-        for flags_modifier in self.path_flags:
-            flags_modifier.run(path, flags, config=config)
-
-        return flags

{sci_fab-2.0 → sci_fab-2.2.0}/source/fab/cli.py

@@ -9,7 +9,7 @@
 
 import sys
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Optional
 
 from fab.artefacts import ArtefactSet, CollectionGetter
 from fab.build_config import BuildConfig
@@ -22,14 +22,17 @@ from fab.steps.compile_fortran import compile_fortran
 from fab.steps.find_source_files import find_source_files
 from fab.steps.grab.folder import grab_folder
 from fab.steps.preprocess import preprocess_c, preprocess_fortran
-from fab.tools import Category, ToolBox, ToolRepository
+from fab.tools.category import Category
+from fab.tools.tool_box import ToolBox
+from fab.tools.tool_repository import ToolRepository
 from fab.util import common_arg_parser
 
 
 def _generic_build_config(folder: Path, kwargs=None) -> BuildConfig:
     project_label = 'zero_config_build'
     if kwargs:
-        project_label = kwargs.pop('project_label', 'zero_config_build') or project_label
+        project_label = kwargs.pop('project_label',
+                                   'zero_config_build') or project_label
 
     # Set the default Fortran compiler as linker (otherwise e.g. the
     # C compiler might be used in linking, requiring additional flags)
@@ -43,15 +46,18 @@ def _generic_build_config(folder: Path, kwargs=None) -> BuildConfig:
     tool_box.add_tool(fc)
     tool_box.add_tool(linker)
     # Within the fab workspace, we'll create a project workspace.
-    # Ideally we'd just use folder.name, but to avoid clashes, we'll use the full absolute path.
+    # Ideally we'd just use folder.name, but to avoid clashes, we'll use the
+    # full absolute path.
     with BuildConfig(project_label=project_label, mpi=False, openmp=False,
                      tool_box=tool_box, **kwargs) as config:
         grab_folder(config, folder)
         find_source_files(config)
-        root_inc_files(config)  # JULES helper, get rid of this eventually
+        # JULES helper, get rid of this eventually
+        root_inc_files(config, suffix_list=[".inc", ".h"])
         preprocess_fortran(config)
         c_pragma_injector(config)
-        preprocess_c(config, source=CollectionGetter(ArtefactSet.C_BUILD_FILES))
+        preprocess_c(config,
+                     source=CollectionGetter(ArtefactSet.C_COMPILER_FILES))
         analyse(config, find_programs=True)
         compile_fortran(config)
         compile_c(config)
@@ -63,11 +69,11 @@ def _generic_build_config(folder: Path, kwargs=None) -> BuildConfig:
     return config
 
 
-def cli_fab(folder: Optional[Path] = None, kwargs: Optional[Dict] = None):
+def cli_fab(folder: Optional[Path] = None, kwargs: Optional[dict] = None):
     """
-    Running Fab from the command line will attempt to build the project in the current or
-    given folder. The following params are used for testing. When run normally any parameters
-    will be caught by a common_arg_parser.
+    Running Fab from the command line will attempt to build the project in
+    the current or given folder. The following params are used for testing.
+    When run normally any parameters will be caught by a common_arg_parser.
 
     :param folder:
         source folder (Testing Only)
@@ -77,9 +83,9 @@ def cli_fab(folder: Optional[Path] = None, kwargs: Optional[Dict] = None):
     """
     kwargs = kwargs or {}
 
-    # We check if 'fab' was called directly. As it can be called by other things like 'pytest',
-    # the cli arguments may not apply to 'fab' which will cause arg_parser to fail with an
-    # invalid argument message.
+    # We check if 'fab' was called directly. As it can be called by other
+    # things like 'pytest', the cli arguments may not apply to 'fab' which
+    # will cause arg_parser to fail with an invalid argument message.
     if Path(sys.argv[0]).parts[-1] == 'fab':
         arg_parser = common_arg_parser()
         kwargs = vars(arg_parser.parse_args())

{sci_fab-2.0 → sci_fab-2.2.0}/source/fab/cui/__main__.py

@@ -13,7 +13,7 @@ from importlib.util import module_from_spec, spec_from_loader
 from importlib.machinery import SourceFileLoader
 from pathlib import Path
 from types import ModuleType
-from typing import List, Optional
+from typing import Optional
 
 
 from .arguments import FabArgumentParser
@@ -50,7 +50,7 @@ def import_from_path(module_name: str, file_path: Path) -> Optional[ModuleType]:
     return module
 
 
-def main(argv: Optional[List[str]] = None):
+def main(argv: Optional[list[str]] = None):
     """Main function.
 
     :param argv: list of command line arguments.  Use sys.argv if not specified.
@@ -58,7 +58,7 @@ def main(argv: Optional[List[str]] = None):
 
     if argv is None:
         # Use system argument if none have been provided
-        argv = sys.argv
+        argv = sys.argv[1:]
 
     parser = FabArgumentParser(description=__doc__)
     file_args = parser.parse_fabfile_only(argv)