Merge branch 'master' into feat/modular-sqfs

Author: simonpintarelli

pyproject.toml

@@ -8,3 +8,7 @@ line-length = 120
 [tool.isort]
 profile = "black"
 skip = ["external/"]
+
+[tool.ruff]
+line-length = 120
+extend-exclude = ["external/", "unittests/recipes"]

stackinator/__init__.py

@@ -1,7 +1,7 @@
 import logging
 import re
 
-VERSION = "4.1.0-dev"
+VERSION = "5.0.0"
 root_logger = logging.getLogger("stackinator")
 
 stackinator_version_info = tuple(re.split(r"\.|-", VERSION))

stackinator/recipe.py

@@ -56,15 +56,15 @@ def __init__(self, args):
         if args.mount:
             self.config["store"] = args.mount
 
-        # # ensure that the requested mount point exists
-        # if not self.mount.is_dir():
-        #     raise FileNotFoundError(f"the mount point '{self.mount}' must exist")
+        # ensure that the requested mount point exists
+        if not self.mount.is_dir():
+            raise FileNotFoundError(f"the mount point '{self.mount}' must exist")
 
         # required environments.yaml file
         environments_path = self.path / "environments.yaml"
         self._logger.debug(f"opening {environments_path}")
         if not environments_path.is_file():
-            raise FileNotFoundError(f"The recipe path '{environments_path}' does " f" not contain environments.yaml")
+            raise FileNotFoundError(f"The recipe path '{environments_path}' does not contain environments.yaml")
 
         with environments_path.open() as fid:
             raw = yaml.load(fid, Loader=yaml.Loader)
@@ -111,7 +111,7 @@ def __init__(self, args):
         mirrors_path = self.path / "mirrors.yaml"
         if mirrors_path.is_file():
             self._logger.warning(
-                "mirrors.yaml have been removed from recipes," " use the --cache option on stack-config instead."
+                "mirrors.yaml have been removed from recipes, use the --cache option on stack-config instead."
             )
             raise RuntimeError("Unsupported mirrors.yaml file in recipe.")
 
@@ -209,7 +209,7 @@ def config(self):
     def config(self, config_path):
         self._logger.debug(f"opening {config_path}")
         if not config_path.is_file():
-            raise FileNotFoundError(f"The recipe path '{config_path}' does not contain compilers.yaml")
+            raise FileNotFoundError(f"The recipe path '{config_path}' does not contain config.yaml")
 
         with config_path.open() as fid:
             raw = yaml.load(fid, Loader=yaml.Loader)
@@ -387,7 +387,7 @@ def generate_environment_specs(self, raw):
             environments[name]["view"] = None
             for i in range(numviews):
                 # pick a name for the environment
-                cname = name if i == 0 else name + f"-{i+1}__"
+                cname = name if i == 0 else name + f"-{i + 1}__"
                 if i > 0:
                     environments[cname] = copy.deepcopy(base)
 

stackinator/templates/compilers.gcc.spack.yaml

@@ -12,7 +12,7 @@ spack:
     reuse: false
   packages:
     gcc:
-      variants: [build_type=Release +strip]
+      variants: [build_type=Release +bootstrap +strip]
     mpc:
       variants: [libs=static]
     gmp: