Remove spack_version logic (#227)

The logic that picks the spack version is no longer needed (at least until we start wrangling post 1.0 updates)

Author: bcumming

stackinator/main.py

@@ -54,9 +54,7 @@ def make_argparser():
     parser.add_argument("-d", "--debug", action="store_true")
     parser.add_argument("-m", "--mount", required=False, type=str)
     parser.add_argument("-c", "--cache", required=False, type=str)
-    spack_version_group = parser.add_mutually_exclusive_group()
-    spack_version_group.add_argument("--develop", action="store_true", required=False)
-    spack_version_group.add_argument("--spack-version", required=False, type=str)
+    parser.add_argument("--develop", action="store_true", required=False)
 
     return parser
 

stackinator/recipe.py

@@ -143,10 +143,9 @@ def __init__(self, args):
             self._logger.debug("no pre install hook provided")
 
         # determine the version of spack being used:
-        # --develop flag implies the next release of spack
-        # --spack-version option explicitly sets the version
-        # otherwise the name of the commit provided in the config.yaml file is inspected
-        self.spack_version = self.find_spack_version(args.develop, args.spack_version)
+        # currently this just returns 1.0... develop is ignored
+        # --develop flag will imply the next release of spack after 1.0 is supported properly
+        self.spack_version = self.find_spack_version(args.develop)
 
     # Returns:
     #   Path: if the recipe contains a spack package repository
@@ -229,46 +228,10 @@ def config(self, config_path):
             schema.config_validator.validate(raw)
             self._config = raw
 
-    def find_spack_version(self, develop, spack_version):
-        # determine the "major" version, if it can be inferred.
-        # one of "0.21", "0.22", "0.23", "0.24" or "unknown".
-        # "0.24" implies the latest features in develop that will
-        # are being developed for the next version of spack
-
-        # the user has explicitly requested develop:
-        if develop:
-            return "0.24"
-
-        if spack_version is not None:
-            return spack_version
-
-        # infer from the branch name
-        # Note: this could be improved by first downloading
-        # the requested spack version/tag/commit, then checking
-        # the version returned by `spack --version`
-        #
-        # this would require defering this decision until after
-        # the repo is cloned in build.py... a lot of work.
-        commit = self.config["spack"]["commit"]
-        if commit is None or commit == "develop":
-            return "0.24"
-        # currently supported
-        if commit.find("0.24") >= 0:
-            return "0.24"
-        # currently supported
-        if commit.find("0.23") >= 0:
-            return "0.23"
-        # currently supported
-        if commit.find("0.22") >= 0:
-            return "0.22"
-        # currently supported
-        if commit.find("0.21") >= 0:
-            return "0.21"
-        # currently supported
-        if commit.find("0.20") >= 0:
-            raise ValueError(f"spack minimum version is v0.21 - recipe uses {commit}")
-
-        return "unknown"
+    # In Stackinator 6 we replaced logic required to determine the
+    # pre 1.0 Spack version.
+    def find_spack_version(self, develop):
+        return "1.0"
 
     @property
     def environment_view_meta(self):

stackinator/templates/Make.user

@@ -37,12 +37,7 @@ export SPACK_COLOR := always
 # config files in ~/.spack. Note that our recommended bwrap setup already puts
 # a tmpfs in the home folder, but when bwrap isn't used, this also helps a bit
 # with reproducibility.
-{% if spack_version>="0.22" %}
-# spack after 0.22.1 chokes on /dev/null
 export SPACK_USER_CONFIG_PATH := ~
-{% else %}
-export SPACK_USER_CONFIG_PATH := /dev/null
-{% endif %}
 
 # Set up the system config scope that has the system packages we don't want
 # build, for example slurm, pmix, etc. Also should have the system compiler.

stackinator/templates/stack-debug.sh

@@ -1 +1 @@
-env --ignore-environment PATH=/usr/bin:/bin:{{ build_path }}/spack/bin http_proxy=$http_proxy https_proxy=$https_proxy HOME=$HOME BUILD_ROOT={{ build_path }} STORE={{ mount_path }} SPACK_SYSTEM_CONFIG_PATH={{ build_path }}/config SPACK_USER_CACHE_PATH={{ build_path }}/cache SPACK=spack SPACK_COLOR=always SPACK_USER_CONFIG_PATH={% if spack_version>="0.23" %}~{% else %}/dev/null{% endif %} LC_ALL=en_US.UTF-8 TZ=UTC SOURCE_DATE_EPOCH=315576060 {% if use_bwrap %} {{ build_path }}/bwrap-mutable-root.sh --tmpfs ~ --bind {{ build_path }}/tmp /tmp --bind {{ build_path }}/store {{ mount_path }} {% endif %} bash -noprofile -l
+env --ignore-environment PATH=/usr/bin:/bin:{{ build_path }}/spack/bin http_proxy=$http_proxy https_proxy=$https_proxy HOME=$HOME BUILD_ROOT={{ build_path }} STORE={{ mount_path }} SPACK_SYSTEM_CONFIG_PATH={{ build_path }}/config SPACK_USER_CACHE_PATH={{ build_path }}/cache SPACK=spack SPACK_COLOR=always SPACK_USER_CONFIG_PATH=~ LC_ALL=en_US.UTF-8 TZ=UTC SOURCE_DATE_EPOCH=315576060 {% if use_bwrap %} {{ build_path }}/bwrap-mutable-root.sh --tmpfs ~ --bind {{ build_path }}/tmp /tmp --bind {{ build_path }}/store {{ mount_path }} {% endif %} bash -noprofile -l