Set version to 0.20.0

Use CompilerSpec with satisfies instead of string equality tests

Co-authored-by: Harmen Stoppels <harmenstoppels@gmail.com>

lib/spack/docs/containers.rst

@@ -143,26 +143,6 @@ The OS that are currently supported are summarized in the table below:
    * - Amazon Linux 2
      - ``amazonlinux:2``
      - ``spack/amazon-linux``
-   * - AlmaLinux 8
-     - ``almalinux:8``
-     - ``spack/almalinux8``
-   * - AlmaLinux 9
-     - ``almalinux:9``
-     - ``spack/almalinux9``
-   * - Rocky Linux 8
-     - ``rockylinux:8``
-     - ``spack/rockylinux8``
-   * - Rocky Linux 9
-     - ``rockylinux:9``
-     - ``spack/rockylinux9``
-   * - Fedora Linux 37
-     - ``fedora:37``
-     - ``spack/fedora37``
-   * - Fedora Linux 38
-     - ``fedora:38``
-     - ``spack/fedora38``
-
-
 
 All the images are tagged with the corresponding release of Spack:
 

lib/spack/spack/__init__.py

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 #: PEP440 canonical <major>.<minor>.<micro>.<devN> string
-__version__ = "0.21.0.dev0"
+__version__ = "0.20.0"
 spack_version = __version__
 
 

lib/spack/spack/cmd/__init__.py

@@ -347,7 +347,7 @@ def iter_groups(specs, indent, all_headers):
             spack.spec.architecture_color,
             architecture if architecture else "no arch",
             spack.spec.compiler_color,
-            f"{compiler}" if compiler else "no compiler",
+            f"{compiler.display_str}" if compiler else "no compiler",
         )
 
         # Sometimes we want to display specs that are not yet concretized.

lib/spack/spack/cmd/compiler.py

@@ -98,7 +98,7 @@ def compiler_find(args):
         config = spack.config.config
         filename = config.get_config_filename(args.scope, "compilers")
         tty.msg("Added %d new compiler%s to %s" % (n, s, filename))
-        colify(reversed(sorted(c.spec for c in new_compilers)), indent=4)
+        colify(reversed(sorted(c.spec.display_str for c in new_compilers)), indent=4)
     else:
         tty.msg("Found no new compilers")
     tty.msg("Compilers are defined in the following files:")
@@ -112,13 +112,13 @@ def compiler_remove(args):
         tty.die("No compilers match spec %s" % cspec)
     elif not args.all and len(compilers) > 1:
         tty.error("Multiple compilers match spec %s. Choose one:" % cspec)
-        colify(reversed(sorted([c.spec for c in compilers])), indent=4)
+        colify(reversed(sorted([c.spec.display_str for c in compilers])), indent=4)
         tty.msg("Or, use `spack compiler remove -a` to remove all of them.")
         sys.exit(1)
 
     for compiler in compilers:
         spack.compilers.remove_compiler_from_config(compiler.spec, scope=args.scope)
-        tty.msg("Removed compiler %s" % compiler.spec)
+        tty.msg("Removed compiler %s" % compiler.spec.display_str)
 
 
 def compiler_info(args):
@@ -130,7 +130,7 @@ def compiler_info(args):
         tty.die("No compilers match spec %s" % cspec)
     else:
         for c in compilers:
-            print(str(c.spec) + ":")
+            print(c.spec.display_str + ":")
             print("\tpaths:")
             for cpath in ["cc", "cxx", "f77", "fc"]:
                 print("\t\t%s = %s" % (cpath, getattr(c, cpath, None)))
@@ -188,7 +188,7 @@ def compiler_list(args):
             os_str += "-%s" % target
         cname = "%s{%s} %s" % (spack.spec.compiler_color, name, os_str)
         tty.hline(colorize(cname), char="-")
-        colify(reversed(sorted(c.spec for c in compilers)))
+        colify(reversed(sorted(c.spec.display_str for c in compilers)))
 
 
 def compiler(parser, args):

lib/spack/spack/cmd/env.py

@@ -302,7 +302,7 @@ def env_create(args):
         # the environment should not include a view.
         with_view = None
 
-    _env_create(
+    env = _env_create(
         args.create_env,
         init_file=args.envfile,
         dir=args.dir,
@@ -310,6 +310,9 @@ def env_create(args):
         keep_relative=args.keep_relative,
     )
 
+    # Generate views, only really useful for environments created from spack.lock files.
+    env.regenerate_views()
+
 
 def _env_create(name_or_path, *, init_file=None, dir=False, with_view=None, keep_relative=False):
     """Create a new environment, with an optional yaml description.

lib/spack/spack/modules/lmod.py

@@ -7,7 +7,7 @@
 import itertools
 import os.path
 import posixpath
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 import llnl.util.lang as lang
 
@@ -56,7 +56,7 @@ def make_context(spec, module_set_name, explicit):
     return LmodContext(conf)
 
 
-def guess_core_compilers(name, store=False):
+def guess_core_compilers(name, store=False) -> List[spack.spec.CompilerSpec]:
     """Guesses the list of core compilers installed in the system.
 
     Args:
@@ -64,21 +64,19 @@ def guess_core_compilers(name, store=False):
             modules.yaml configuration file
 
     Returns:
-        List of core compilers, if found, or None
+        List of found core compilers
     """
     core_compilers = []
-    for compiler_config in spack.compilers.all_compilers_config():
+    for compiler in spack.compilers.all_compilers():
         try:
-            compiler = compiler_config["compiler"]
             # A compiler is considered to be a core compiler if any of the
             # C, C++ or Fortran compilers reside in a system directory
             is_system_compiler = any(
-                os.path.dirname(x) in spack.util.environment.SYSTEM_DIRS
-                for x in compiler["paths"].values()
-                if x is not None
+                os.path.dirname(getattr(compiler, x, "")) in spack.util.environment.SYSTEM_DIRS
+                for x in ("cc", "cxx", "f77", "fc")
             )
             if is_system_compiler:
-                core_compilers.append(str(compiler["spec"]))
+                core_compilers.append(compiler.spec)
         except (KeyError, TypeError, AttributeError):
             continue
 
@@ -89,10 +87,10 @@ def guess_core_compilers(name, store=False):
         modules_cfg = spack.config.get(
             "modules:" + name, {}, scope=spack.config.default_modify_scope()
         )
-        modules_cfg.setdefault("lmod", {})["core_compilers"] = core_compilers
+        modules_cfg.setdefault("lmod", {})["core_compilers"] = [str(x) for x in core_compilers]
         spack.config.set("modules:" + name, modules_cfg, scope=spack.config.default_modify_scope())
 
-    return core_compilers or None
+    return core_compilers
 
 
 class LmodConfiguration(BaseConfiguration):
@@ -104,7 +102,7 @@ class LmodConfiguration(BaseConfiguration):
     default_projections = {"all": posixpath.join("{name}", "{version}")}
 
     @property
-    def core_compilers(self):
+    def core_compilers(self) -> List[spack.spec.CompilerSpec]:
         """Returns the list of "Core" compilers
 
         Raises:
@@ -112,14 +110,18 @@ def core_compilers(self):
                 specified in the configuration file or the sequence
                 is empty
         """
-        value = configuration(self.name).get("core_compilers") or guess_core_compilers(
-            self.name, store=True
-        )
+        compilers = [
+            spack.spec.CompilerSpec(c) for c in configuration(self.name).get("core_compilers", [])
+        ]
 
-        if not value:
+        if not compilers:
+            compilers = guess_core_compilers(self.name, store=True)
+
+        if not compilers:
             msg = 'the key "core_compilers" must be set in modules.yaml'
             raise CoreCompilersNotFoundError(msg)
-        return value
+
+        return compilers
 
     @property
     def core_specs(self):
@@ -283,16 +285,18 @@ def token_to_path(self, name, value):
 
         # If we are dealing with a core compiler, return 'Core'
         core_compilers = self.conf.core_compilers
-        if name == "compiler" and str(value) in core_compilers:
+        if name == "compiler" and any(
+            spack.spec.CompilerSpec(value).satisfies(c) for c in core_compilers
+        ):
             return "Core"
 
-        # CompilerSpec does not have an hash, as we are not allowed to
+        # CompilerSpec does not have a hash, as we are not allowed to
         # use different flavors of the same compiler
         if name == "compiler":
             return path_part_fmt.format(token=value)
 
         # In case the hierarchy token refers to a virtual provider
-        # we need to append an hash to the version to distinguish
+        # we need to append a hash to the version to distinguish
         # among flavors of the same library (e.g. openblas~openmp vs.
         # openblas+openmp)
         path = path_part_fmt.format(token=value)

lib/spack/spack/spec.py

@@ -679,6 +679,16 @@ def from_dict(d):
         d = d["compiler"]
         return CompilerSpec(d["name"], vn.VersionList.from_dict(d))
 
+    @property
+    def display_str(self):
+        """Equivalent to {compiler.name}{@compiler.version} for Specs, without extra
+        @= for readability."""
+        if self.concrete:
+            return f"{self.name}@{self.version}"
+        elif self.versions != vn.any_version:
+            return f"{self.name}@{self.versions}"
+        return self.name
+
     def __str__(self):
         out = self.name
         if self.versions and self.versions != vn.any_version:
@@ -1730,14 +1740,14 @@ def traverse_edges(self, **kwargs):
     def short_spec(self):
         """Returns a version of the spec with the dependencies hashed
         instead of completely enumerated."""
-        spec_format = "{name}{@version}{%compiler}"
+        spec_format = "{name}{@version}{%compiler.name}{@compiler.version}"
         spec_format += "{variants}{arch=architecture}{/hash:7}"
         return self.format(spec_format)
 
     @property
     def cshort_spec(self):
         """Returns an auto-colorized version of ``self.short_spec``."""
-        spec_format = "{name}{@version}{%compiler}"
+        spec_format = "{name}{@version}{%compiler.name}{@compiler.version}"
         spec_format += "{variants}{arch=architecture}{/hash:7}"
         return self.cformat(spec_format)
 

lib/spack/spack/test/cmd/compiler.py

@@ -204,8 +204,8 @@ def test_compiler_find_mixed_suffixes(no_compilers_yaml, working_env, clangdir):
     os.environ["PATH"] = str(clangdir)
     output = compiler("find", "--scope=site")
 
-    assert "clang@=11.0.0" in output
-    assert "gcc@=8.4.0" in output
+    assert "clang@11.0.0" in output
+    assert "gcc@8.4.0" in output
 
     config = spack.compilers.get_compiler_config("site", False)
     clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@=11.0.0")
@@ -246,8 +246,8 @@ def test_compiler_find_prefer_no_suffix(no_compilers_yaml, working_env, clangdir
     os.environ["PATH"] = str(clangdir)
     output = compiler("find", "--scope=site")
 
-    assert "clang@=11.0.0" in output
-    assert "gcc@=8.4.0" in output
+    assert "clang@11.0.0" in output
+    assert "gcc@8.4.0" in output
 
     config = spack.compilers.get_compiler_config("site", False)
     clang = next(c["compiler"] for c in config if c["compiler"]["spec"] == "clang@=11.0.0")

lib/spack/spack/test/cmd/env.py

@@ -3299,3 +3299,22 @@ def test_environment_created_in_users_location(mutable_config, tmpdir):
     assert dir_name in out
     assert env_dir in ev.root(dir_name)
     assert os.path.isdir(os.path.join(env_dir, dir_name))
+
+
+def test_environment_created_from_lockfile_has_view(mock_packages, tmpdir):
+    """When an env is created from a lockfile, a view should be generated for it"""
+    env_a = str(tmpdir.join("a"))
+    env_b = str(tmpdir.join("b"))
+
+    # Create an environment and install a package in it
+    env("create", "-d", env_a)
+    with ev.Environment(env_a):
+        add("libelf")
+        install("--fake")
+
+    # Create another environment from the lockfile of the first environment
+    env("create", "-d", env_b, os.path.join(env_a, "spack.lock"))
+
+    # Make sure the view was created
+    with ev.Environment(env_b) as e:
+        assert os.path.isdir(e.view_path_default)

lib/spack/spack/test/data/modules/lmod/complex_hierarchy.yaml

@@ -4,7 +4,7 @@ lmod:
   hash_length: 0
 
   core_compilers:
-    - 'clang@3.3'
+    - 'clang@12.0.0'
 
   core_specs:
     - 'mpich@3.0.1'

lib/spack/spack/test/data/modules/lmod/core_compilers.yaml

@@ -0,0 +1,5 @@
+enable:
+  - lmod
+lmod:
+  core_compilers:
+    - 'clang@12.0.0'

lib/spack/spack/test/data/modules/lmod/core_compilers_at_equal.yaml

@@ -0,0 +1,5 @@
+enable:
+  - lmod
+lmod:
+  core_compilers:
+    - 'clang@=12.0.0'

lib/spack/spack/test/data/unparse/amdfftw.txt

@@ -31,164 +31,194 @@ class Amdfftw(FftwBase):
     Example : spack install amdfftw precision=float
     """
 
-    _name = "amdfftw"
+    _name = 'amdfftw'
     homepage = "https://developer.amd.com/amd-aocl/fftw/"
     url = "https://github.com/amd/amd-fftw/archive/3.0.tar.gz"
     git = "https://github.com/amd/amd-fftw.git"
 
-    maintainers("amd-toolchain-support")
+    maintainers = ['amd-toolchain-support']
 
-    version("3.1", sha256="3e777f3acef13fa1910db097e818b1d0d03a6a36ef41186247c6ab1ab0afc132")
-    version("3.0.1", sha256="87030c6bbb9c710f0a64f4f306ba6aa91dc4b182bb804c9022b35aef274d1a4c")
-    version("3.0", sha256="a69deaf45478a59a69f77c4f7e9872967f1cfe996592dd12beb6318f18ea0bcd")
-    version("2.2", sha256="de9d777236fb290c335860b458131678f75aa0799c641490c644c843f0e246f8")
+    version('3.1', sha256='3e777f3acef13fa1910db097e818b1d0d03a6a36ef41186247c6ab1ab0afc132')
+    version('3.0.1', sha256='87030c6bbb9c710f0a64f4f306ba6aa91dc4b182bb804c9022b35aef274d1a4c')
+    version('3.0', sha256='a69deaf45478a59a69f77c4f7e9872967f1cfe996592dd12beb6318f18ea0bcd')
+    version('2.2', sha256='de9d777236fb290c335860b458131678f75aa0799c641490c644c843f0e246f8')
 
-    variant("shared", default=True, description="Builds a shared version of the library")
-    variant("openmp", default=True, description="Enable OpenMP support")
-    variant("threads", default=False, description="Enable SMP threads support")
-    variant("debug", default=False, description="Builds a debug version of the library")
+    variant('shared', default=True,
+            description='Builds a shared version of the library')
+    variant('openmp', default=True,
+            description='Enable OpenMP support')
+    variant('threads', default=False,
+            description='Enable SMP threads support')
+    variant('debug', default=False,
+            description='Builds a debug version of the library')
     variant(
-        "amd-fast-planner",
+        'amd-fast-planner',
         default=False,
-        description="Option to reduce the planning time without much"
-        "tradeoff in the performance. It is supported for"
-        "Float and double precisions only.",
-    )
-    variant("amd-top-n-planner", default=False, description="Build with amd-top-n-planner support")
+        description='Option to reduce the planning time without much'
+                    'tradeoff in the performance. It is supported for'
+                    'Float and double precisions only.')
     variant(
-        "amd-mpi-vader-limit", default=False, description="Build with amd-mpi-vader-limit support"
-    )
-    variant("static", default=False, description="Build with static suppport")
-    variant("amd-trans", default=False, description="Build with amd-trans suppport")
-    variant("amd-app-opt", default=False, description="Build with amd-app-opt suppport")
+        'amd-top-n-planner',
+        default=False,
+        description='Build with amd-top-n-planner support')
+    variant(
+        'amd-mpi-vader-limit',
+        default=False,
+        description='Build with amd-mpi-vader-limit support')
+    variant(
+        'static',
+        default=False,
+        description='Build with static suppport')
+    variant(
+        'amd-trans',
+        default=False,
+        description='Build with amd-trans suppport')
+    variant(
+        'amd-app-opt',
+        default=False,
+        description='Build with amd-app-opt suppport')
 
-    depends_on("texinfo")
+    depends_on('texinfo')
 
-    provides("fftw-api@3", when="@2:")
+    provides('fftw-api@3', when='@2:')
 
     conflicts(
-        "precision=quad",
-        when="@2.2 %aocc",
-        msg="Quad precision is not supported by AOCC clang version 2.2",
-    )
+        'precision=quad',
+        when='@2.2 %aocc',
+        msg='Quad precision is not supported by AOCC clang version 2.2')
     conflicts(
-        "+debug", when="@2.2 %aocc", msg="debug mode is not supported by AOCC clang version 2.2"
-    )
-    conflicts("%gcc@:7.2", when="@2.2:", msg="GCC version above 7.2 is required for AMDFFTW")
+        '+debug',
+        when='@2.2 %aocc',
+        msg='debug mode is not supported by AOCC clang version 2.2')
     conflicts(
-        "+amd-fast-planner ", when="+mpi", msg="mpi thread is not supported with amd-fast-planner"
-    )
+        '%gcc@:7.2',
+        when='@2.2:',
+        msg='GCC version above 7.2 is required for AMDFFTW')
     conflicts(
-        "+amd-fast-planner", when="@2.2", msg="amd-fast-planner is supported from 3.0 onwards"
-    )
+        '+amd-fast-planner ',
+        when='+mpi',
+        msg='mpi thread is not supported with amd-fast-planner')
     conflicts(
-        "+amd-fast-planner",
-        when="precision=quad",
-        msg="Quad precision is not supported with amd-fast-planner",
-    )
+        '+amd-fast-planner',
+        when='@2.2',
+        msg='amd-fast-planner is supported from 3.0 onwards')
     conflicts(
-        "+amd-fast-planner",
-        when="precision=long_double",
-        msg="long_double precision is not supported with amd-fast-planner",
-    )
+        '+amd-fast-planner',
+        when='precision=quad',
+        msg='Quad precision is not supported with amd-fast-planner')
     conflicts(
-        "+amd-top-n-planner",
-        when="@:3.0.0",
-        msg="amd-top-n-planner is supported from 3.0.1 onwards",
-    )
+        '+amd-fast-planner',
+        when='precision=long_double',
+        msg='long_double precision is not supported with amd-fast-planner')
     conflicts(
-        "+amd-top-n-planner",
-        when="precision=long_double",
-        msg="long_double precision is not supported with amd-top-n-planner",
-    )
+        '+amd-top-n-planner',
+        when='@:3.0.0',
+        msg='amd-top-n-planner is supported from 3.0.1 onwards')
     conflicts(
-        "+amd-top-n-planner",
-        when="precision=quad",
-        msg="Quad precision is not supported with amd-top-n-planner",
-    )
+        '+amd-top-n-planner',
+        when='precision=long_double',
+        msg='long_double precision is not supported with amd-top-n-planner')
     conflicts(
-        "+amd-top-n-planner",
-        when="+amd-fast-planner",
-        msg="amd-top-n-planner cannot be used with amd-fast-planner",
-    )
+        '+amd-top-n-planner',
+        when='precision=quad',
+        msg='Quad precision is not supported with amd-top-n-planner')
     conflicts(
-        "+amd-top-n-planner", when="+threads", msg="amd-top-n-planner works only for single thread"
-    )
+        '+amd-top-n-planner',
+        when='+amd-fast-planner',
+        msg='amd-top-n-planner cannot be used with amd-fast-planner')
     conflicts(
-        "+amd-top-n-planner", when="+mpi", msg="mpi thread is not supported with amd-top-n-planner"
-    )
+        '+amd-top-n-planner',
+        when='+threads',
+        msg='amd-top-n-planner works only for single thread')
     conflicts(
-        "+amd-top-n-planner",
-        when="+openmp",
-        msg="openmp thread is not supported with amd-top-n-planner",
-    )
+        '+amd-top-n-planner',
+        when='+mpi',
+        msg='mpi thread is not supported with amd-top-n-planner')
     conflicts(
-        "+amd-mpi-vader-limit",
-        when="@:3.0.0",
-        msg="amd-mpi-vader-limit is supported from 3.0.1 onwards",
-    )
+        '+amd-top-n-planner',
+        when='+openmp',
+        msg='openmp thread is not supported with amd-top-n-planner')
     conflicts(
-        "+amd-mpi-vader-limit",
-        when="precision=quad",
-        msg="Quad precision is not supported with amd-mpi-vader-limit",
-    )
-    conflicts("+amd-trans", when="+threads", msg="amd-trans works only for single thread")
-    conflicts("+amd-trans", when="+mpi", msg="mpi thread is not supported with amd-trans")
-    conflicts("+amd-trans", when="+openmp", msg="openmp thread is not supported with amd-trans")
+        '+amd-mpi-vader-limit',
+        when='@:3.0.0',
+        msg='amd-mpi-vader-limit is supported from 3.0.1 onwards')
     conflicts(
-        "+amd-trans",
-        when="precision=long_double",
-        msg="long_double precision is not supported with amd-trans",
-    )
+        '+amd-mpi-vader-limit',
+        when='precision=quad',
+        msg='Quad precision is not supported with amd-mpi-vader-limit')
     conflicts(
-        "+amd-trans", when="precision=quad", msg="Quad precision is not supported with amd-trans"
-    )
-    conflicts("+amd-app-opt", when="@:3.0.1", msg="amd-app-opt is supported from 3.1 onwards")
-    conflicts("+amd-app-opt", when="+mpi", msg="mpi thread is not supported with amd-app-opt")
+        '+amd-trans',
+        when='+threads',
+        msg='amd-trans works only for single thread')
     conflicts(
-        "+amd-app-opt",
-        when="precision=long_double",
-        msg="long_double precision is not supported with amd-app-opt",
-    )
+        '+amd-trans',
+        when='+mpi',
+        msg='mpi thread is not supported with amd-trans')
     conflicts(
-        "+amd-app-opt",
-        when="precision=quad",
-        msg="Quad precision is not supported with amd-app-opt",
-    )
+        '+amd-trans',
+        when='+openmp',
+        msg='openmp thread is not supported with amd-trans')
+    conflicts(
+        '+amd-trans',
+        when='precision=long_double',
+        msg='long_double precision is not supported with amd-trans')
+    conflicts(
+        '+amd-trans',
+        when='precision=quad',
+        msg='Quad precision is not supported with amd-trans')
+    conflicts(
+        '+amd-app-opt',
+        when='@:3.0.1',
+        msg='amd-app-opt is supported from 3.1 onwards')
+    conflicts(
+        '+amd-app-opt',
+        when='+mpi',
+        msg='mpi thread is not supported with amd-app-opt')
+    conflicts(
+        '+amd-app-opt',
+        when='precision=long_double',
+        msg='long_double precision is not supported with amd-app-opt')
+    conflicts(
+        '+amd-app-opt',
+        when='precision=quad',
+        msg='Quad precision is not supported with amd-app-opt')
 
     def configure(self, spec, prefix):
         """Configure function"""
         # Base options
-        options = ["--prefix={0}".format(prefix), "--enable-amd-opt"]
+        options = [
+            '--prefix={0}'.format(prefix),
+            '--enable-amd-opt'
+        ]
 
         # Check if compiler is AOCC
-        if "%aocc" in spec:
-            options.append("CC={0}".format(os.path.basename(spack_cc)))
-            options.append("FC={0}".format(os.path.basename(spack_fc)))
-            options.append("F77={0}".format(os.path.basename(spack_fc)))
+        if '%aocc' in spec:
+            options.append('CC={0}'.format(os.path.basename(spack_cc)))
+            options.append('FC={0}'.format(os.path.basename(spack_fc)))
+            options.append('F77={0}'.format(os.path.basename(spack_fc)))
 
-        if "+debug" in spec:
-            options.append("--enable-debug")
+        if '+debug' in spec:
+            options.append('--enable-debug')
 
-        if "+mpi" in spec:
-            options.append("--enable-mpi")
-            options.append("--enable-amd-mpifft")
+        if '+mpi' in spec:
+            options.append('--enable-mpi')
+            options.append('--enable-amd-mpifft')
         else:
-            options.append("--disable-mpi")
-            options.append("--disable-amd-mpifft")
+            options.append('--disable-mpi')
+            options.append('--disable-amd-mpifft')
 
-        options.extend(self.enable_or_disable("shared"))
-        options.extend(self.enable_or_disable("openmp"))
-        options.extend(self.enable_or_disable("threads"))
-        options.extend(self.enable_or_disable("amd-fast-planner"))
-        options.extend(self.enable_or_disable("amd-top-n-planner"))
-        options.extend(self.enable_or_disable("amd-mpi-vader-limit"))
-        options.extend(self.enable_or_disable("static"))
-        options.extend(self.enable_or_disable("amd-trans"))
-        options.extend(self.enable_or_disable("amd-app-opt"))
+        options.extend(self.enable_or_disable('shared'))
+        options.extend(self.enable_or_disable('openmp'))
+        options.extend(self.enable_or_disable('threads'))
+        options.extend(self.enable_or_disable('amd-fast-planner'))
+        options.extend(self.enable_or_disable('amd-top-n-planner'))
+        options.extend(self.enable_or_disable('amd-mpi-vader-limit'))
+        options.extend(self.enable_or_disable('static'))
+        options.extend(self.enable_or_disable('amd-trans'))
+        options.extend(self.enable_or_disable('amd-app-opt'))
 
         if not self.compiler.f77 or not self.compiler.fc:
-            options.append("--disable-fortran")
+            options.append('--disable-fortran')
 
         # Cross compilation is supported in amd-fftw by making use of target
         # variable to set AMD_ARCH configure option.
@@ -196,16 +226,17 @@ class Amdfftw(FftwBase):
         # use target variable to set appropriate -march option in AMD_ARCH.
         arch = spec.architecture
         options.append(
-            "AMD_ARCH={0}".format(arch.target.optimization_flags(spec.compiler).split("=")[-1])
-        )
+            'AMD_ARCH={0}'.format(
+                arch.target.optimization_flags(
+                    spec.compiler).split('=')[-1]))
 
         # Specific SIMD support.
         # float and double precisions are supported
-        simd_features = ["sse2", "avx", "avx2"]
+        simd_features = ['sse2', 'avx', 'avx2']
 
         simd_options = []
         for feature in simd_features:
-            msg = "--enable-{0}" if feature in spec.target else "--disable-{0}"
+            msg = '--enable-{0}' if feature in spec.target else '--disable-{0}'
             simd_options.append(msg.format(feature))
 
         # When enabling configure option "--enable-amd-opt", do not use the
@@ -215,19 +246,20 @@ class Amdfftw(FftwBase):
         # Double is the default precision, for all the others we need
         # to enable the corresponding option.
         enable_precision = {
-            "float": ["--enable-float"],
-            "double": None,
-            "long_double": ["--enable-long-double"],
-            "quad": ["--enable-quad-precision"],
+            'float': ['--enable-float'],
+            'double': None,
+            'long_double': ['--enable-long-double'],
+            'quad': ['--enable-quad-precision']
         }
 
         # Different precisions must be configured and compiled one at a time
-        configure = Executable("../configure")
+        configure = Executable('../configure')
         for precision in self.selected_precisions:
+
             opts = (enable_precision[precision] or []) + options[:]
 
             # SIMD optimizations are available only for float and double
-            if precision in ("float", "double"):
+            if precision in ('float', 'double'):
                 opts += simd_options
 
             with working_dir(precision, create=True):

lib/spack/spack/test/data/unparse/llvm.txt

@@ -16,21 +16,21 @@ from spack.package import *
 
 class Llvm(CMakePackage, CudaPackage):
     """The LLVM Project is a collection of modular and reusable compiler and
-    toolchain technologies. Despite its name, LLVM has little to do
-    with traditional virtual machines, though it does provide helpful
-    libraries that can be used to build them. The name "LLVM" itself
-    is not an acronym; it is the full name of the project.
+       toolchain technologies. Despite its name, LLVM has little to do
+       with traditional virtual machines, though it does provide helpful
+       libraries that can be used to build them. The name "LLVM" itself
+       is not an acronym; it is the full name of the project.
     """
 
     homepage = "https://llvm.org/"
     url = "https://github.com/llvm/llvm-project/archive/llvmorg-7.1.0.tar.gz"
     list_url = "https://releases.llvm.org/download.html"
     git = "https://github.com/llvm/llvm-project"
-    maintainers("trws", "haampie")
+    maintainers = ['trws', 'haampie']
 
-    tags = ["e4s"]
+    tags = ['e4s']
 
-    generator = "Ninja"
+    generator = 'Ninja'
 
     family = "compiler"  # Used by lmod
 
@@ -80,12 +80,13 @@ class Llvm(CMakePackage, CudaPackage):
     # to save space, build with `build_type=Release`.
 
     variant(
-        "clang", default=True, description="Build the LLVM C/C++/Objective-C compiler frontend"
+        "clang",
+        default=True,
+        description="Build the LLVM C/C++/Objective-C compiler frontend",
     )
     variant(
         "flang",
-        default=False,
-        when="@11: +clang",
+        default=False, when='@11: +clang',
         description="Build the LLVM Fortran compiler frontend "
         "(experimental - parser only, needs GCC)",
     )
@@ -94,23 +95,27 @@ class Llvm(CMakePackage, CudaPackage):
         default=False,
         description="Include debugging code in OpenMP runtime libraries",
     )
-    variant("lldb", default=True, when="+clang", description="Build the LLVM debugger")
+    variant("lldb", default=True, when='+clang', description="Build the LLVM debugger")
     variant("lld", default=True, description="Build the LLVM linker")
-    variant("mlir", default=False, when="@10:", description="Build with MLIR support")
+    variant("mlir", default=False, when='@10:', description="Build with MLIR support")
     variant(
-        "internal_unwind", default=True, when="+clang", description="Build the libcxxabi libunwind"
+        "internal_unwind",
+        default=True, when='+clang',
+        description="Build the libcxxabi libunwind",
     )
     variant(
         "polly",
         default=True,
-        description="Build the LLVM polyhedral optimization plugin, " "only builds for 3.7.0+",
+        description="Build the LLVM polyhedral optimization plugin, "
+        "only builds for 3.7.0+",
     )
     variant(
-        "libcxx", default=True, when="+clang", description="Build the LLVM C++ standard library"
+        "libcxx",
+        default=True, when='+clang',
+        description="Build the LLVM C++ standard library",
     )
     variant(
-        "compiler-rt",
-        when="+clang",
+        "compiler-rt", when='+clang',
         default=True,
         description="Build LLVM compiler runtime, including sanitizers",
     )
@@ -119,7 +124,11 @@ class Llvm(CMakePackage, CudaPackage):
         default=(sys.platform != "darwin"),
         description="Add support for LTO with the gold linker plugin",
     )
-    variant("split_dwarf", default=False, description="Build with split dwarf information")
+    variant(
+        "split_dwarf",
+        default=False,
+        description="Build with split dwarf information",
+    )
     variant(
         "llvm_dylib",
         default=True,
@@ -127,40 +136,18 @@ class Llvm(CMakePackage, CudaPackage):
     )
     variant(
         "link_llvm_dylib",
-        default=False,
-        when="+llvm_dylib",
+        default=False, when='+llvm_dylib',
         description="Link LLVM tools against the LLVM shared library",
     )
     variant(
         "targets",
         default="none",
-        description=(
-            "What targets to build. Spack's target family is always added "
-            "(e.g. X86 is automatically enabled when targeting znver2)."
-        ),
-        values=(
-            "all",
-            "none",
-            "aarch64",
-            "amdgpu",
-            "arm",
-            "avr",
-            "bpf",
-            "cppbackend",
-            "hexagon",
-            "lanai",
-            "mips",
-            "msp430",
-            "nvptx",
-            "powerpc",
-            "riscv",
-            "sparc",
-            "systemz",
-            "webassembly",
-            "x86",
-            "xcore",
-        ),
-        multi=True,
+        description=("What targets to build. Spack's target family is always added "
+                     "(e.g. X86 is automatically enabled when targeting znver2)."),
+        values=("all", "none", "aarch64", "amdgpu", "arm", "avr", "bpf", "cppbackend",
+                "hexagon", "lanai", "mips", "msp430", "nvptx", "powerpc", "riscv",
+                "sparc", "systemz", "webassembly", "x86", "xcore"),
+        multi=True
     )
     variant(
         "build_type",
@@ -170,52 +157,51 @@ class Llvm(CMakePackage, CudaPackage):
     )
     variant(
         "omp_tsan",
-        default=False,
-        when="@6:",
+        default=False, when='@6:',
         description="Build with OpenMP capable thread sanitizer",
     )
     variant(
         "omp_as_runtime",
         default=True,
-        when="+clang @12:",
+        when='+clang @12:',
         description="Build OpenMP runtime via ENABLE_RUNTIME by just-built Clang",
     )
-    variant(
-        "code_signing",
-        default=False,
-        when="+lldb platform=darwin",
-        description="Enable code-signing on macOS",
-    )
+    variant('code_signing', default=False,
+            when='+lldb platform=darwin',
+            description="Enable code-signing on macOS")
     variant("python", default=False, description="Install python bindings")
-    variant("version_suffix", default="none", description="Add a symbol suffix")
+    variant('version_suffix', default='none', description="Add a symbol suffix")
     variant(
-        "shlib_symbol_version",
-        default="none",
+        'shlib_symbol_version',
+        default='none',
         description="Add shared library symbol version",
-        when="@13:",
+        when='@13:'
     )
     variant(
-        "z3", default=False, when="+clang @8:", description="Use Z3 for the clang static analyzer"
+        'z3',
+        default=False,
+        when='+clang @8:',
+        description='Use Z3 for the clang static analyzer'
     )
 
-    provides("libllvm@14", when="@14.0.0:14")
-    provides("libllvm@13", when="@13.0.0:13")
-    provides("libllvm@12", when="@12.0.0:12")
-    provides("libllvm@11", when="@11.0.0:11")
-    provides("libllvm@10", when="@10.0.0:10")
-    provides("libllvm@9", when="@9.0.0:9")
-    provides("libllvm@8", when="@8.0.0:8")
-    provides("libllvm@7", when="@7.0.0:7")
-    provides("libllvm@6", when="@6.0.0:6")
-    provides("libllvm@5", when="@5.0.0:5")
-    provides("libllvm@4", when="@4.0.0:4")
-    provides("libllvm@3", when="@3.0.0:3")
+    provides('libllvm@14', when='@14.0.0:14')
+    provides('libllvm@13', when='@13.0.0:13')
+    provides('libllvm@12', when='@12.0.0:12')
+    provides('libllvm@11', when='@11.0.0:11')
+    provides('libllvm@10', when='@10.0.0:10')
+    provides('libllvm@9', when='@9.0.0:9')
+    provides('libllvm@8', when='@8.0.0:8')
+    provides('libllvm@7', when='@7.0.0:7')
+    provides('libllvm@6', when='@6.0.0:6')
+    provides('libllvm@5', when='@5.0.0:5')
+    provides('libllvm@4', when='@4.0.0:4')
+    provides('libllvm@3', when='@3.0.0:3')
 
     extends("python", when="+python")
 
     # Build dependency
     depends_on("cmake@3.4.3:", type="build")
-    depends_on("cmake@3.13.4:", type="build", when="@12:")
+    depends_on('cmake@3.13.4:', type='build', when='@12:')
     depends_on("ninja", type="build")
     depends_on("python@2.7:2.8", when="@:4 ~python", type="build")
     depends_on("python", when="@5: ~python", type="build")
@@ -256,7 +242,7 @@ class Llvm(CMakePackage, CudaPackage):
     # clang/lib: a lambda parameter cannot shadow an explicitly captured entity
     conflicts("%clang@8:", when="@:4")
     # Internal compiler error on gcc 8.4 on aarch64 https://bugzilla.redhat.com/show_bug.cgi?id=1958295
-    conflicts("%gcc@8.4:8.4.9", when="@12: target=aarch64:")
+    conflicts('%gcc@8.4:8.4.9', when='@12: target=aarch64:')
 
     # When these versions are concretized, but not explicitly with +libcxx, these
     # conflicts will enable clingo to set ~libcxx, making the build successful:
@@ -266,17 +252,17 @@ class Llvm(CMakePackage, CudaPackage):
     # GCC    11     - latest stable release per GCC release page
     # Clang: 11, 12 - latest two stable releases per LLVM release page
     # AppleClang 12 - latest stable release per Xcode release page
-    conflicts("%gcc@:10", when="@13:+libcxx")
-    conflicts("%clang@:10", when="@13:+libcxx")
+    conflicts("%gcc@:10",         when="@13:+libcxx")
+    conflicts("%clang@:10",       when="@13:+libcxx")
     conflicts("%apple-clang@:11", when="@13:+libcxx")
 
     # libcxx-4 and compiler-rt-4 fail to build with "newer" clang and gcc versions:
-    conflicts("%gcc@7:", when="@:4+libcxx")
-    conflicts("%clang@6:", when="@:4+libcxx")
-    conflicts("%apple-clang@6:", when="@:4+libcxx")
-    conflicts("%gcc@7:", when="@:4+compiler-rt")
-    conflicts("%clang@6:", when="@:4+compiler-rt")
-    conflicts("%apple-clang@6:", when="@:4+compiler-rt")
+    conflicts('%gcc@7:',         when='@:4+libcxx')
+    conflicts('%clang@6:',       when='@:4+libcxx')
+    conflicts('%apple-clang@6:', when='@:4+libcxx')
+    conflicts('%gcc@7:',         when='@:4+compiler-rt')
+    conflicts('%clang@6:',       when='@:4+compiler-rt')
+    conflicts('%apple-clang@6:', when='@:4+compiler-rt')
 
     # cuda_arch value must be specified
     conflicts("cuda_arch=none", when="+cuda", msg="A value for cuda_arch must be specified.")
@@ -284,27 +270,27 @@ class Llvm(CMakePackage, CudaPackage):
     # LLVM bug https://bugs.llvm.org/show_bug.cgi?id=48234
     # CMake bug: https://gitlab.kitware.com/cmake/cmake/-/issues/21469
     # Fixed in upstream versions of both
-    conflicts("^cmake@3.19.0", when="@6:11.0.0")
+    conflicts('^cmake@3.19.0', when='@6:11.0.0')
 
     # Github issue #4986
     patch("llvm_gcc7.patch", when="@4.0.0:4.0.1+lldb %gcc@7.0:")
 
     # sys/ustat.h has been removed in favour of statfs from glibc-2.28. Use fixed sizes:
-    patch("llvm5-sanitizer-ustat.patch", when="@4:6.0.0+compiler-rt")
+    patch('llvm5-sanitizer-ustat.patch', when="@4:6.0.0+compiler-rt")
 
     # Fix lld templates: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230463
-    patch("llvm4-lld-ELF-Symbols.patch", when="@4+lld%clang@6:")
-    patch("llvm5-lld-ELF-Symbols.patch", when="@5+lld%clang@7:")
+    patch('llvm4-lld-ELF-Symbols.patch', when="@4+lld%clang@6:")
+    patch('llvm5-lld-ELF-Symbols.patch', when="@5+lld%clang@7:")
 
     # Fix missing std:size_t in 'llvm@4:5' when built with '%clang@7:'
-    patch("xray_buffer_queue-cstddef.patch", when="@4:5+compiler-rt%clang@7:")
+    patch('xray_buffer_queue-cstddef.patch', when="@4:5+compiler-rt%clang@7:")
 
     # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
-    patch("sanitizer-ipc_perm_mode.patch", when="@5:7+compiler-rt%clang@11:")
-    patch("sanitizer-ipc_perm_mode.patch", when="@5:9+compiler-rt%gcc@9:")
+    patch('sanitizer-ipc_perm_mode.patch', when="@5:7+compiler-rt%clang@11:")
+    patch('sanitizer-ipc_perm_mode.patch', when="@5:9+compiler-rt%gcc@9:")
 
     # github.com/spack/spack/issues/24270: MicrosoftDemangle for %gcc@10: and %clang@13:
-    patch("missing-includes.patch", when="@8")
+    patch('missing-includes.patch', when='@8')
 
     # Backport from llvm master + additional fix
     # see  https://bugs.llvm.org/show_bug.cgi?id=39696
@@ -329,33 +315,33 @@ class Llvm(CMakePackage, CudaPackage):
     patch("llvm_python_path.patch", when="@:11")
 
     # Workaround for issue https://github.com/spack/spack/issues/18197
-    patch("llvm7_intel.patch", when="@7 %intel@18.0.2,19.0.0:19.1.99")
+    patch('llvm7_intel.patch', when='@7 %intel@18.0.2,19.0.0:19.1.99')
 
     # Remove cyclades support to build against newer kernel headers
     # https://reviews.llvm.org/D102059
-    patch("no_cyclades.patch", when="@10:12.0.0")
-    patch("no_cyclades9.patch", when="@6:9")
+    patch('no_cyclades.patch', when='@10:12.0.0')
+    patch('no_cyclades9.patch', when='@6:9')
 
-    patch("llvm-gcc11.patch", when="@9:11%gcc@11:")
+    patch('llvm-gcc11.patch', when='@9:11%gcc@11:')
 
     # add -lpthread to build OpenMP libraries with Fujitsu compiler
-    patch("llvm12-thread.patch", when="@12 %fj")
-    patch("llvm13-thread.patch", when="@13 %fj")
+    patch('llvm12-thread.patch', when='@12 %fj')
+    patch('llvm13-thread.patch', when='@13 %fj')
 
     # avoid build failed with Fujitsu compiler
-    patch("llvm13-fujitsu.patch", when="@13 %fj")
+    patch('llvm13-fujitsu.patch', when='@13 %fj')
 
     # patch for missing hwloc.h include for libompd
-    patch("llvm14-hwloc-ompd.patch", when="@14")
+    patch('llvm14-hwloc-ompd.patch', when='@14')
 
     # make libflags a list in openmp subproject when ~omp_as_runtime
-    patch("libomp-libflags-as-list.patch", when="@3.7:")
+    patch('libomp-libflags-as-list.patch', when='@3.7:')
 
     # The functions and attributes below implement external package
     # detection for LLVM. See:
     #
     # https://spack.readthedocs.io/en/latest/packaging_guide.html#making-a-package-discoverable-with-spack-external-find
-    executables = ["clang", "flang", "ld.lld", "lldb"]
+    executables = ['clang', 'flang', 'ld.lld', 'lldb']
 
     @classmethod
     def filter_detected_exes(cls, prefix, exes_in_prefix):
@@ -365,7 +351,7 @@ class Llvm(CMakePackage, CudaPackage):
             # on some port and would hang Spack during detection.
             # clang-cl and clang-cpp are dev tools that we don't
             # need to test
-            if any(x in exe for x in ("vscode", "cpp", "-cl", "-gpu")):
+            if any(x in exe for x in ('vscode', 'cpp', '-cl', '-gpu')):
                 continue
             result.append(exe)
         return result
@@ -374,20 +360,20 @@ class Llvm(CMakePackage, CudaPackage):
     def determine_version(cls, exe):
         version_regex = re.compile(
             # Normal clang compiler versions are left as-is
-            r"clang version ([^ )\n]+)-svn[~.\w\d-]*|"
+            r'clang version ([^ )\n]+)-svn[~.\w\d-]*|'
             # Don't include hyphenated patch numbers in the version
             # (see https://github.com/spack/spack/pull/14365 for details)
-            r"clang version ([^ )\n]+?)-[~.\w\d-]*|"
-            r"clang version ([^ )\n]+)|"
+            r'clang version ([^ )\n]+?)-[~.\w\d-]*|'
+            r'clang version ([^ )\n]+)|'
             # LLDB
-            r"lldb version ([^ )\n]+)|"
+            r'lldb version ([^ )\n]+)|'
             # LLD
-            r"LLD ([^ )\n]+) \(compatible with GNU linkers\)"
+            r'LLD ([^ )\n]+) \(compatible with GNU linkers\)'
         )
         try:
             compiler = Executable(exe)
-            output = compiler("--version", output=str, error=str)
-            if "Apple" in output:
+            output = compiler('--version', output=str, error=str)
+            if 'Apple' in output:
                 return None
             match = version_regex.search(output)
             if match:
@@ -401,39 +387,38 @@ class Llvm(CMakePackage, CudaPackage):
 
     @classmethod
     def determine_variants(cls, exes, version_str):
-        variants, compilers = ["+clang"], {}
+        variants, compilers = ['+clang'], {}
         lld_found, lldb_found = False, False
         for exe in exes:
-            if "clang++" in exe:
-                compilers["cxx"] = exe
-            elif "clang" in exe:
-                compilers["c"] = exe
-            elif "flang" in exe:
-                variants.append("+flang")
-                compilers["fc"] = exe
-                compilers["f77"] = exe
-            elif "ld.lld" in exe:
+            if 'clang++' in exe:
+                compilers['cxx'] = exe
+            elif 'clang' in exe:
+                compilers['c'] = exe
+            elif 'flang' in exe:
+                variants.append('+flang')
+                compilers['fc'] = exe
+                compilers['f77'] = exe
+            elif 'ld.lld' in exe:
                 lld_found = True
-                compilers["ld"] = exe
-            elif "lldb" in exe:
+                compilers['ld'] = exe
+            elif 'lldb' in exe:
                 lldb_found = True
-                compilers["lldb"] = exe
+                compilers['lldb'] = exe
 
-        variants.append("+lld" if lld_found else "~lld")
-        variants.append("+lldb" if lldb_found else "~lldb")
+        variants.append('+lld' if lld_found else '~lld')
+        variants.append('+lldb' if lldb_found else '~lldb')
 
-        return "".join(variants), {"compilers": compilers}
+        return ''.join(variants), {'compilers': compilers}
 
     @classmethod
     def validate_detected_spec(cls, spec, extra_attributes):
         # For LLVM 'compilers' is a mandatory attribute
-        msg = 'the extra attribute "compilers" must be set for ' 'the detected spec "{0}"'.format(
-            spec
-        )
-        assert "compilers" in extra_attributes, msg
-        compilers = extra_attributes["compilers"]
-        for key in ("c", "cxx"):
-            msg = "{0} compiler not found for {1}"
+        msg = ('the extra attribute "compilers" must be set for '
+               'the detected spec "{0}"'.format(spec))
+        assert 'compilers' in extra_attributes, msg
+        compilers = extra_attributes['compilers']
+        for key in ('c', 'cxx'):
+            msg = '{0} compiler not found for {1}'
             assert key in compilers, msg.format(key, spec)
 
     @property
@@ -441,10 +426,10 @@ class Llvm(CMakePackage, CudaPackage):
         msg = "cannot retrieve C compiler [spec is not concrete]"
         assert self.spec.concrete, msg
         if self.spec.external:
-            return self.spec.extra_attributes["compilers"].get("c", None)
+            return self.spec.extra_attributes['compilers'].get('c', None)
         result = None
-        if "+clang" in self.spec:
-            result = os.path.join(self.spec.prefix.bin, "clang")
+        if '+clang' in self.spec:
+            result = os.path.join(self.spec.prefix.bin, 'clang')
         return result
 
     @property
@@ -452,10 +437,10 @@ class Llvm(CMakePackage, CudaPackage):
         msg = "cannot retrieve C++ compiler [spec is not concrete]"
         assert self.spec.concrete, msg
         if self.spec.external:
-            return self.spec.extra_attributes["compilers"].get("cxx", None)
+            return self.spec.extra_attributes['compilers'].get('cxx', None)
         result = None
-        if "+clang" in self.spec:
-            result = os.path.join(self.spec.prefix.bin, "clang++")
+        if '+clang' in self.spec:
+            result = os.path.join(self.spec.prefix.bin, 'clang++')
         return result
 
     @property
@@ -463,10 +448,10 @@ class Llvm(CMakePackage, CudaPackage):
         msg = "cannot retrieve Fortran compiler [spec is not concrete]"
         assert self.spec.concrete, msg
         if self.spec.external:
-            return self.spec.extra_attributes["compilers"].get("fc", None)
+            return self.spec.extra_attributes['compilers'].get('fc', None)
         result = None
-        if "+flang" in self.spec:
-            result = os.path.join(self.spec.prefix.bin, "flang")
+        if '+flang' in self.spec:
+            result = os.path.join(self.spec.prefix.bin, 'flang')
         return result
 
     @property
@@ -474,25 +459,27 @@ class Llvm(CMakePackage, CudaPackage):
         msg = "cannot retrieve Fortran 77 compiler [spec is not concrete]"
         assert self.spec.concrete, msg
         if self.spec.external:
-            return self.spec.extra_attributes["compilers"].get("f77", None)
+            return self.spec.extra_attributes['compilers'].get('f77', None)
         result = None
-        if "+flang" in self.spec:
-            result = os.path.join(self.spec.prefix.bin, "flang")
+        if '+flang' in self.spec:
+            result = os.path.join(self.spec.prefix.bin, 'flang')
         return result
 
     @property
     def libs(self):
-        return LibraryList(self.llvm_config("--libfiles", "all", result="list"))
+        return LibraryList(self.llvm_config("--libfiles", "all",
+                                            result="list"))
 
-    @run_before("cmake")
+    @run_before('cmake')
     def codesign_check(self):
         if self.spec.satisfies("+code_signing"):
-            codesign = which("codesign")
-            mkdir("tmp")
-            llvm_check_file = join_path("tmp", "llvm_check")
-            copy("/usr/bin/false", llvm_check_file)
+            codesign = which('codesign')
+            mkdir('tmp')
+            llvm_check_file = join_path('tmp', 'llvm_check')
+            copy('/usr/bin/false', llvm_check_file)
             try:
-                codesign("-f", "-s", "lldb_codesign", "--dryrun", llvm_check_file)
+                codesign('-f', '-s', 'lldb_codesign', '--dryrun',
+                         llvm_check_file)
 
             except ProcessError:
                 # Newer LLVM versions have a simple script that sets up
@@ -502,32 +489,32 @@ class Llvm(CMakePackage, CudaPackage):
                     setup()
                 except Exception:
                     raise RuntimeError(
-                        "spack was unable to either find or set up"
-                        "code-signing on your system. Please refer to"
-                        "https://lldb.llvm.org/resources/build.html#"
-                        "code-signing-on-macos for details on how to"
-                        "create this identity."
+                        'spack was unable to either find or set up'
+                        'code-signing on your system. Please refer to'
+                        'https://lldb.llvm.org/resources/build.html#'
+                        'code-signing-on-macos for details on how to'
+                        'create this identity.'
                     )
 
     def flag_handler(self, name, flags):
-        if name == "cxxflags":
+        if name == 'cxxflags':
             flags.append(self.compiler.cxx11_flag)
-            return (None, flags, None)
-        elif name == "ldflags" and self.spec.satisfies("%intel"):
-            flags.append("-shared-intel")
-            return (None, flags, None)
-        return (flags, None, None)
+            return(None, flags, None)
+        elif name == 'ldflags' and self.spec.satisfies('%intel'):
+            flags.append('-shared-intel')
+            return(None, flags, None)
+        return(flags, None, None)
 
     def setup_build_environment(self, env):
         """When using %clang, add only its ld.lld-$ver and/or ld.lld to our PATH"""
-        if self.compiler.name in ["clang", "apple-clang"]:
-            for lld in "ld.lld-{0}".format(self.compiler.version.version[0]), "ld.lld":
+        if self.compiler.name in ['clang', 'apple-clang']:
+            for lld in 'ld.lld-{0}'.format(self.compiler.version.version[0]), 'ld.lld':
                 bin = os.path.join(os.path.dirname(self.compiler.cc), lld)
-                sym = os.path.join(self.stage.path, "ld.lld")
+                sym = os.path.join(self.stage.path, 'ld.lld')
                 if os.path.exists(bin) and not os.path.exists(sym):
                     mkdirp(self.stage.path)
                     os.symlink(bin, sym)
-            env.prepend_path("PATH", self.stage.path)
+            env.prepend_path('PATH', self.stage.path)
 
     def setup_run_environment(self, env):
         if "+clang" in self.spec:
@@ -544,7 +531,7 @@ class Llvm(CMakePackage, CudaPackage):
         define = CMakePackage.define
         from_variant = self.define_from_variant
 
-        python = spec["python"]
+        python = spec['python']
         cmake_args = [
             define("LLVM_REQUIRES_RTTI", True),
             define("LLVM_ENABLE_RTTI", True),
@@ -557,13 +544,14 @@ class Llvm(CMakePackage, CudaPackage):
             define("LIBOMP_HWLOC_INSTALL_DIR", spec["hwloc"].prefix),
         ]
 
-        version_suffix = spec.variants["version_suffix"].value
-        if version_suffix != "none":
-            cmake_args.append(define("LLVM_VERSION_SUFFIX", version_suffix))
+        version_suffix = spec.variants['version_suffix'].value
+        if version_suffix != 'none':
+            cmake_args.append(define('LLVM_VERSION_SUFFIX', version_suffix))
 
-        shlib_symbol_version = spec.variants.get("shlib_symbol_version", None)
-        if shlib_symbol_version is not None and shlib_symbol_version.value != "none":
-            cmake_args.append(define("LLVM_SHLIB_SYMBOL_VERSION", shlib_symbol_version.value))
+        shlib_symbol_version = spec.variants.get('shlib_symbol_version', None)
+        if shlib_symbol_version is not None and shlib_symbol_version.value != 'none':
+            cmake_args.append(define('LLVM_SHLIB_SYMBOL_VERSION',
+                              shlib_symbol_version.value))
 
         if python.version >= Version("3"):
             cmake_args.append(define("Python3_EXECUTABLE", python.command.path))
@@ -574,56 +562,47 @@ class Llvm(CMakePackage, CudaPackage):
         runtimes = []
 
         if "+cuda" in spec:
-            cmake_args.extend(
-                [
-                    define("CUDA_TOOLKIT_ROOT_DIR", spec["cuda"].prefix),
-                    define(
-                        "LIBOMPTARGET_NVPTX_COMPUTE_CAPABILITIES",
-                        ",".join(spec.variants["cuda_arch"].value),
-                    ),
-                    define(
-                        "CLANG_OPENMP_NVPTX_DEFAULT_ARCH",
-                        "sm_{0}".format(spec.variants["cuda_arch"].value[-1]),
-                    ),
-                ]
-            )
+            cmake_args.extend([
+                define("CUDA_TOOLKIT_ROOT_DIR", spec["cuda"].prefix),
+                define("LIBOMPTARGET_NVPTX_COMPUTE_CAPABILITIES",
+                       ",".join(spec.variants["cuda_arch"].value)),
+                define("CLANG_OPENMP_NVPTX_DEFAULT_ARCH",
+                       "sm_{0}".format(spec.variants["cuda_arch"].value[-1])),
+            ])
             if "+omp_as_runtime" in spec:
-                cmake_args.extend(
-                    [
-                        define("LIBOMPTARGET_NVPTX_ENABLE_BCLIB", True),
-                        # work around bad libelf detection in libomptarget
-                        define(
-                            "LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR", spec["libelf"].prefix.include
-                        ),
-                    ]
-                )
+                cmake_args.extend([
+                    define("LIBOMPTARGET_NVPTX_ENABLE_BCLIB", True),
+                    # work around bad libelf detection in libomptarget
+                    define("LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR",
+                           spec["libelf"].prefix.include),
+                ])
         else:
             # still build libomptarget but disable cuda
-            cmake_args.extend(
-                [
-                    define("CUDA_TOOLKIT_ROOT_DIR", "IGNORE"),
-                    define("CUDA_SDK_ROOT_DIR", "IGNORE"),
-                    define("CUDA_NVCC_EXECUTABLE", "IGNORE"),
-                    define("LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES", "IGNORE"),
-                ]
-            )
+            cmake_args.extend([
+                define("CUDA_TOOLKIT_ROOT_DIR", "IGNORE"),
+                define("CUDA_SDK_ROOT_DIR", "IGNORE"),
+                define("CUDA_NVCC_EXECUTABLE", "IGNORE"),
+                define("LIBOMPTARGET_DEP_CUDA_DRIVER_LIBRARIES", "IGNORE"),
+            ])
 
         cmake_args.append(from_variant("LIBOMPTARGET_ENABLE_DEBUG", "omp_debug"))
 
         if "+lldb" in spec:
             projects.append("lldb")
-            cmake_args.append(define("LLDB_ENABLE_LIBEDIT", True))
-            cmake_args.append(define("LLDB_ENABLE_NCURSES", True))
-            cmake_args.append(define("LLDB_ENABLE_LIBXML2", False))
-            if spec.version >= Version("10"):
-                cmake_args.append(from_variant("LLDB_ENABLE_PYTHON", "python"))
+            cmake_args.append(define('LLDB_ENABLE_LIBEDIT', True))
+            cmake_args.append(define('LLDB_ENABLE_NCURSES', True))
+            cmake_args.append(define('LLDB_ENABLE_LIBXML2', False))
+            if spec.version >= Version('10'):
+                cmake_args.append(from_variant("LLDB_ENABLE_PYTHON", 'python'))
             else:
-                cmake_args.append(define("LLDB_DISABLE_PYTHON", "~python" in spec))
+                cmake_args.append(define("LLDB_DISABLE_PYTHON", '~python' in spec))
             if spec.satisfies("@5.0.0: +python"):
                 cmake_args.append(define("LLDB_USE_SYSTEM_SIX", True))
 
         if "+gold" in spec:
-            cmake_args.append(define("LLVM_BINUTILS_INCDIR", spec["binutils"].prefix.include))
+            cmake_args.append(
+                define("LLVM_BINUTILS_INCDIR", spec["binutils"].prefix.include)
+            )
 
         if "+clang" in spec:
             projects.append("clang")
@@ -633,10 +612,10 @@ class Llvm(CMakePackage, CudaPackage):
             else:
                 projects.append("openmp")
 
-            if "@8" in spec:
-                cmake_args.append(from_variant("CLANG_ANALYZER_ENABLE_Z3_SOLVER", "z3"))
-            elif "@9:" in spec:
-                cmake_args.append(from_variant("LLVM_ENABLE_Z3_SOLVER", "z3"))
+            if '@8' in spec:
+                cmake_args.append(from_variant('CLANG_ANALYZER_ENABLE_Z3_SOLVER', 'z3'))
+            elif '@9:' in spec:
+                cmake_args.append(from_variant('LLVM_ENABLE_Z3_SOLVER', 'z3'))
 
         if "+flang" in spec:
             projects.append("flang")
@@ -655,26 +634,26 @@ class Llvm(CMakePackage, CudaPackage):
             projects.append("polly")
             cmake_args.append(define("LINK_POLLY_INTO_TOOLS", True))
 
-        cmake_args.extend(
-            [
-                define("BUILD_SHARED_LIBS", False),
-                from_variant("LLVM_BUILD_LLVM_DYLIB", "llvm_dylib"),
-                from_variant("LLVM_LINK_LLVM_DYLIB", "link_llvm_dylib"),
-                from_variant("LLVM_USE_SPLIT_DWARF", "split_dwarf"),
-                # By default on Linux, libc++.so is a ldscript. CMake fails to add
-                # CMAKE_INSTALL_RPATH to it, which fails. Statically link libc++abi.a
-                # into libc++.so, linking with -lc++ or -stdlib=libc++ is enough.
-                define("LIBCXX_ENABLE_STATIC_ABI_LIBRARY", True),
-            ]
-        )
+        cmake_args.extend([
+            define("BUILD_SHARED_LIBS", False),
+            from_variant("LLVM_BUILD_LLVM_DYLIB", "llvm_dylib"),
+            from_variant("LLVM_LINK_LLVM_DYLIB", "link_llvm_dylib"),
+            from_variant("LLVM_USE_SPLIT_DWARF", "split_dwarf"),
+            # By default on Linux, libc++.so is a ldscript. CMake fails to add
+            # CMAKE_INSTALL_RPATH to it, which fails. Statically link libc++abi.a
+            # into libc++.so, linking with -lc++ or -stdlib=libc++ is enough.
+            define('LIBCXX_ENABLE_STATIC_ABI_LIBRARY', True)
+        ])
 
-        cmake_args.append(define("LLVM_TARGETS_TO_BUILD", get_llvm_targets_to_build(spec)))
+        cmake_args.append(define(
+            "LLVM_TARGETS_TO_BUILD",
+            get_llvm_targets_to_build(spec)))
 
         cmake_args.append(from_variant("LIBOMP_TSAN_SUPPORT", "omp_tsan"))
 
         if self.compiler.name == "gcc":
             compiler = Executable(self.compiler.cc)
-            gcc_output = compiler("-print-search-dirs", output=str, error=str)
+            gcc_output = compiler('-print-search-dirs', output=str, error=str)
 
             for line in gcc_output.splitlines():
                 if line.startswith("install:"):
@@ -686,7 +665,7 @@ class Llvm(CMakePackage, CudaPackage):
             cmake_args.append(define("GCC_INSTALL_PREFIX", gcc_prefix))
 
         if self.spec.satisfies("~code_signing platform=darwin"):
-            cmake_args.append(define("LLDB_USE_SYSTEM_DEBUGSERVER", True))
+            cmake_args.append(define('LLDB_USE_SYSTEM_DEBUGSERVER', True))
 
         # Semicolon seperated list of projects to enable
         cmake_args.append(define("LLVM_ENABLE_PROJECTS", projects))
@@ -710,24 +689,20 @@ class Llvm(CMakePackage, CudaPackage):
             # rebuild libomptarget to get bytecode runtime library files
             with working_dir(ompdir, create=True):
                 cmake_args = [
-                    "-G",
-                    "Ninja",
-                    define("CMAKE_BUILD_TYPE", spec.variants["build_type"].value),
+                    '-G', 'Ninja',
+                    define('CMAKE_BUILD_TYPE', spec.variants['build_type'].value),
                     define("CMAKE_C_COMPILER", spec.prefix.bin + "/clang"),
                     define("CMAKE_CXX_COMPILER", spec.prefix.bin + "/clang++"),
                     define("CMAKE_INSTALL_PREFIX", spec.prefix),
-                    define("CMAKE_PREFIX_PATH", prefix_paths),
+                    define('CMAKE_PREFIX_PATH', prefix_paths)
                 ]
                 cmake_args.extend(self.cmake_args())
-                cmake_args.extend(
-                    [
-                        define("LIBOMPTARGET_NVPTX_ENABLE_BCLIB", True),
-                        define(
-                            "LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR", spec["libelf"].prefix.include
-                        ),
-                        self.stage.source_path + "/openmp",
-                    ]
-                )
+                cmake_args.extend([
+                    define("LIBOMPTARGET_NVPTX_ENABLE_BCLIB", True),
+                    define("LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR",
+                           spec["libelf"].prefix.include),
+                    self.stage.source_path + "/openmp",
+                ])
 
                 cmake(*cmake_args)
                 ninja()
@@ -742,22 +717,22 @@ class Llvm(CMakePackage, CudaPackage):
             install_tree("bin", join_path(self.prefix, "libexec", "llvm"))
 
     def llvm_config(self, *args, **kwargs):
-        lc = Executable(self.prefix.bin.join("llvm-config"))
-        if not kwargs.get("output"):
-            kwargs["output"] = str
+        lc = Executable(self.prefix.bin.join('llvm-config'))
+        if not kwargs.get('output'):
+            kwargs['output'] = str
         ret = lc(*args, **kwargs)
-        if kwargs.get("result") == "list":
+        if kwargs.get('result') == "list":
             return ret.split()
         else:
             return ret
 
 
 def get_llvm_targets_to_build(spec):
-    targets = spec.variants["targets"].value
+    targets = spec.variants['targets'].value
 
     # Build everything?
-    if "all" in targets:
-        return "all"
+    if 'all' in targets:
+        return 'all'
 
     # Convert targets variant values to CMake LLVM_TARGETS_TO_BUILD array.
     spack_to_cmake = {
@@ -778,10 +753,10 @@ def get_llvm_targets_to_build(spec):
         "systemz": "SystemZ",
         "webassembly": "WebAssembly",
         "x86": "X86",
-        "xcore": "XCore",
+        "xcore": "XCore"
     }
 
-    if "none" in targets:
+    if 'none' in targets:
         llvm_targets = set()
     else:
         llvm_targets = set(spack_to_cmake[target] for target in targets)

lib/spack/spack/test/data/unparse/py-torch.txt

@@ -22,140 +22,127 @@ class PyTorch(PythonPackage, CudaPackage):
     with strong GPU acceleration."""
 
     homepage = "https://pytorch.org/"
-    git = "https://github.com/pytorch/pytorch.git"
+    git      = "https://github.com/pytorch/pytorch.git"
 
-    maintainers("adamjstewart")
+    maintainers = ['adamjstewart']
 
     # Exact set of modules is version- and variant-specific, just attempt to import the
     # core libraries to ensure that the package was successfully installed.
-    import_modules = ["torch", "torch.autograd", "torch.nn", "torch.utils"]
+    import_modules = ['torch', 'torch.autograd', 'torch.nn', 'torch.utils']
 
-    version("master", branch="master", submodules=True)
-    version("1.10.1", tag="v1.10.1", submodules=True)
-    version("1.10.0", tag="v1.10.0", submodules=True)
-    version("1.9.1", tag="v1.9.1", submodules=True)
-    version("1.9.0", tag="v1.9.0", submodules=True)
-    version("1.8.2", tag="v1.8.2", submodules=True)
-    version("1.8.1", tag="v1.8.1", submodules=True)
-    version("1.8.0", tag="v1.8.0", submodules=True)
-    version("1.7.1", tag="v1.7.1", submodules=True)
-    version("1.7.0", tag="v1.7.0", submodules=True)
-    version("1.6.0", tag="v1.6.0", submodules=True)
-    version("1.5.1", tag="v1.5.1", submodules=True)
-    version("1.5.0", tag="v1.5.0", submodules=True)
-    version("1.4.1", tag="v1.4.1", submodules=True)
-    version(
-        "1.4.0",
-        tag="v1.4.0",
-        submodules=True,
-        deprecated=True,
-        submodules_delete=["third_party/fbgemm"],
-    )
-    version("1.3.1", tag="v1.3.1", submodules=True)
-    version("1.3.0", tag="v1.3.0", submodules=True)
-    version("1.2.0", tag="v1.2.0", submodules=True)
-    version("1.1.0", tag="v1.1.0", submodules=True)
-    version("1.0.1", tag="v1.0.1", submodules=True)
-    version("1.0.0", tag="v1.0.0", submodules=True)
-    version(
-        "0.4.1",
-        tag="v0.4.1",
-        submodules=True,
-        deprecated=True,
-        submodules_delete=["third_party/nervanagpu"],
-    )
-    version("0.4.0", tag="v0.4.0", submodules=True, deprecated=True)
-    version("0.3.1", tag="v0.3.1", submodules=True, deprecated=True)
+    version('master', branch='master', submodules=True)
+    version('1.10.1', tag='v1.10.1', submodules=True)
+    version('1.10.0', tag='v1.10.0', submodules=True)
+    version('1.9.1', tag='v1.9.1', submodules=True)
+    version('1.9.0', tag='v1.9.0', submodules=True)
+    version('1.8.2', tag='v1.8.2', submodules=True)
+    version('1.8.1', tag='v1.8.1', submodules=True)
+    version('1.8.0', tag='v1.8.0', submodules=True)
+    version('1.7.1', tag='v1.7.1', submodules=True)
+    version('1.7.0', tag='v1.7.0', submodules=True)
+    version('1.6.0', tag='v1.6.0', submodules=True)
+    version('1.5.1', tag='v1.5.1', submodules=True)
+    version('1.5.0', tag='v1.5.0', submodules=True)
+    version('1.4.1', tag='v1.4.1', submodules=True)
+    version('1.4.0', tag='v1.4.0', submodules=True, deprecated=True,
+            submodules_delete=['third_party/fbgemm'])
+    version('1.3.1', tag='v1.3.1', submodules=True)
+    version('1.3.0', tag='v1.3.0', submodules=True)
+    version('1.2.0', tag='v1.2.0', submodules=True)
+    version('1.1.0', tag='v1.1.0', submodules=True)
+    version('1.0.1', tag='v1.0.1', submodules=True)
+    version('1.0.0', tag='v1.0.0', submodules=True)
+    version('0.4.1', tag='v0.4.1', submodules=True, deprecated=True,
+            submodules_delete=['third_party/nervanagpu'])
+    version('0.4.0', tag='v0.4.0', submodules=True, deprecated=True)
+    version('0.3.1', tag='v0.3.1', submodules=True, deprecated=True)
 
-    is_darwin = sys.platform == "darwin"
+    is_darwin = sys.platform == 'darwin'
 
     # All options are defined in CMakeLists.txt.
     # Some are listed in setup.py, but not all.
-    variant("caffe2", default=True, description="Build Caffe2")
-    variant("test", default=False, description="Build C++ test binaries")
-    variant("cuda", default=not is_darwin, description="Use CUDA")
-    variant("rocm", default=False, description="Use ROCm")
-    variant("cudnn", default=not is_darwin, description="Use cuDNN")
-    variant("fbgemm", default=True, description="Use FBGEMM (quantized 8-bit server operators)")
-    variant("kineto", default=True, description="Use Kineto profiling library")
-    variant("magma", default=not is_darwin, description="Use MAGMA")
-    variant("metal", default=is_darwin, description="Use Metal for Caffe2 iOS build")
-    variant("nccl", default=not is_darwin, description="Use NCCL")
-    variant("nnpack", default=True, description="Use NNPACK")
-    variant("numa", default=not is_darwin, description="Use NUMA")
-    variant("numpy", default=True, description="Use NumPy")
-    variant("openmp", default=True, description="Use OpenMP for parallel code")
-    variant("qnnpack", default=True, description="Use QNNPACK (quantized 8-bit operators)")
-    variant("valgrind", default=not is_darwin, description="Use Valgrind")
-    variant("xnnpack", default=True, description="Use XNNPACK")
-    variant("mkldnn", default=True, description="Use MKLDNN")
-    variant("distributed", default=not is_darwin, description="Use distributed")
-    variant("mpi", default=not is_darwin, description="Use MPI for Caffe2")
-    variant("gloo", default=not is_darwin, description="Use Gloo")
-    variant("tensorpipe", default=not is_darwin, description="Use TensorPipe")
-    variant("onnx_ml", default=True, description="Enable traditional ONNX ML API")
-    variant("breakpad", default=True, description="Enable breakpad crash dump library")
+    variant('caffe2', default=True, description='Build Caffe2')
+    variant('test', default=False, description='Build C++ test binaries')
+    variant('cuda', default=not is_darwin, description='Use CUDA')
+    variant('rocm', default=False, description='Use ROCm')
+    variant('cudnn', default=not is_darwin, description='Use cuDNN')
+    variant('fbgemm', default=True, description='Use FBGEMM (quantized 8-bit server operators)')
+    variant('kineto', default=True, description='Use Kineto profiling library')
+    variant('magma', default=not is_darwin, description='Use MAGMA')
+    variant('metal', default=is_darwin, description='Use Metal for Caffe2 iOS build')
+    variant('nccl', default=not is_darwin, description='Use NCCL')
+    variant('nnpack', default=True, description='Use NNPACK')
+    variant('numa', default=not is_darwin, description='Use NUMA')
+    variant('numpy', default=True, description='Use NumPy')
+    variant('openmp', default=True, description='Use OpenMP for parallel code')
+    variant('qnnpack', default=True, description='Use QNNPACK (quantized 8-bit operators)')
+    variant('valgrind', default=not is_darwin, description='Use Valgrind')
+    variant('xnnpack', default=True, description='Use XNNPACK')
+    variant('mkldnn', default=True, description='Use MKLDNN')
+    variant('distributed', default=not is_darwin, description='Use distributed')
+    variant('mpi', default=not is_darwin, description='Use MPI for Caffe2')
+    variant('gloo', default=not is_darwin, description='Use Gloo')
+    variant('tensorpipe', default=not is_darwin, description='Use TensorPipe')
+    variant('onnx_ml', default=True, description='Enable traditional ONNX ML API')
+    variant('breakpad', default=True, description='Enable breakpad crash dump library')
 
-    conflicts("+cuda", when="+rocm")
-    conflicts("+cudnn", when="~cuda")
-    conflicts("+magma", when="~cuda")
-    conflicts("+nccl", when="~cuda~rocm")
-    conflicts("+nccl", when="platform=darwin")
-    conflicts("+numa", when="platform=darwin", msg="Only available on Linux")
-    conflicts("+valgrind", when="platform=darwin", msg="Only available on Linux")
-    conflicts("+mpi", when="~distributed")
-    conflicts("+gloo", when="~distributed")
-    conflicts("+tensorpipe", when="~distributed")
-    conflicts("+kineto", when="@:1.7")
-    conflicts("+valgrind", when="@:1.7")
-    conflicts("~caffe2", when="@0.4.0:1.6")  # no way to disable caffe2?
-    conflicts("+caffe2", when="@:0.3.1")  # caffe2 did not yet exist?
-    conflicts("+tensorpipe", when="@:1.5")
-    conflicts("+xnnpack", when="@:1.4")
-    conflicts("~onnx_ml", when="@:1.4")  # no way to disable ONNX?
-    conflicts("+rocm", when="@:0.4")
-    conflicts("+cudnn", when="@:0.4")
-    conflicts("+fbgemm", when="@:0.4,1.4.0")
-    conflicts("+qnnpack", when="@:0.4")
-    conflicts("+mkldnn", when="@:0.4")
-    conflicts("+breakpad", when="@:1.9")  # Option appeared in 1.10.0
-    conflicts("+breakpad", when="target=ppc64:", msg="Unsupported")
-    conflicts("+breakpad", when="target=ppc64le:", msg="Unsupported")
+    conflicts('+cuda', when='+rocm')
+    conflicts('+cudnn', when='~cuda')
+    conflicts('+magma', when='~cuda')
+    conflicts('+nccl', when='~cuda~rocm')
+    conflicts('+nccl', when='platform=darwin')
+    conflicts('+numa', when='platform=darwin', msg='Only available on Linux')
+    conflicts('+valgrind', when='platform=darwin', msg='Only available on Linux')
+    conflicts('+mpi', when='~distributed')
+    conflicts('+gloo', when='~distributed')
+    conflicts('+tensorpipe', when='~distributed')
+    conflicts('+kineto', when='@:1.7')
+    conflicts('+valgrind', when='@:1.7')
+    conflicts('~caffe2', when='@0.4.0:1.6')  # no way to disable caffe2?
+    conflicts('+caffe2', when='@:0.3.1')  # caffe2 did not yet exist?
+    conflicts('+tensorpipe', when='@:1.5')
+    conflicts('+xnnpack', when='@:1.4')
+    conflicts('~onnx_ml', when='@:1.4')  # no way to disable ONNX?
+    conflicts('+rocm', when='@:0.4')
+    conflicts('+cudnn', when='@:0.4')
+    conflicts('+fbgemm', when='@:0.4,1.4.0')
+    conflicts('+qnnpack', when='@:0.4')
+    conflicts('+mkldnn', when='@:0.4')
+    conflicts('+breakpad', when='@:1.9')  # Option appeared in 1.10.0
+    conflicts('+breakpad', when='target=ppc64:', msg='Unsupported')
+    conflicts('+breakpad', when='target=ppc64le:', msg='Unsupported')
 
-    conflicts(
-        "cuda_arch=none",
-        when="+cuda",
-        msg="Must specify CUDA compute capabilities of your GPU, see "
-        "https://developer.nvidia.com/cuda-gpus",
-    )
+    conflicts('cuda_arch=none', when='+cuda',
+              msg='Must specify CUDA compute capabilities of your GPU, see '
+              'https://developer.nvidia.com/cuda-gpus')
 
     # Required dependencies
-    depends_on("cmake@3.5:", type="build")
+    depends_on('cmake@3.5:', type='build')
     # Use Ninja generator to speed up build times, automatically used if found
-    depends_on("ninja@1.5:", when="@1.1.0:", type="build")
+    depends_on('ninja@1.5:', when='@1.1.0:', type='build')
     # See python_min_version in setup.py
-    depends_on("python@3.6.2:", when="@1.7.1:", type=("build", "link", "run"))
-    depends_on("python@3.6.1:", when="@1.6.0:1.7.0", type=("build", "link", "run"))
-    depends_on("python@3.5:", when="@1.5.0:1.5", type=("build", "link", "run"))
-    depends_on("python@2.7:2.8,3.5:", when="@1.4.0:1.4", type=("build", "link", "run"))
-    depends_on("python@2.7:2.8,3.5:3.7", when="@:1.3", type=("build", "link", "run"))
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-future", when="@1.5:", type=("build", "run"))
-    depends_on("py-future", when="@1.1: ^python@:2", type=("build", "run"))
-    depends_on("py-pyyaml", type=("build", "run"))
-    depends_on("py-typing", when="@0.4: ^python@:3.4", type=("build", "run"))
-    depends_on("py-typing-extensions", when="@1.7:", type=("build", "run"))
-    depends_on("py-pybind11@2.6.2", when="@1.8.0:", type=("build", "link", "run"))
-    depends_on("py-pybind11@2.3.0", when="@1.1.0:1.7", type=("build", "link", "run"))
-    depends_on("py-pybind11@2.2.4", when="@1.0.0:1.0", type=("build", "link", "run"))
-    depends_on("py-pybind11@2.2.2", when="@0.4.0:0.4", type=("build", "link", "run"))
-    depends_on("py-dataclasses", when="@1.7: ^python@3.6.0:3.6", type=("build", "run"))
-    depends_on("py-tqdm", type="run")
-    depends_on("py-protobuf", when="@0.4:", type=("build", "run"))
-    depends_on("protobuf", when="@0.4:")
-    depends_on("blas")
-    depends_on("lapack")
-    depends_on("eigen", when="@0.4:")
+    depends_on('python@3.6.2:', when='@1.7.1:', type=('build', 'link', 'run'))
+    depends_on('python@3.6.1:', when='@1.6.0:1.7.0', type=('build', 'link', 'run'))
+    depends_on('python@3.5:', when='@1.5.0:1.5', type=('build', 'link', 'run'))
+    depends_on('python@2.7:2.8,3.5:', when='@1.4.0:1.4', type=('build', 'link', 'run'))
+    depends_on('python@2.7:2.8,3.5:3.7', when='@:1.3', type=('build', 'link', 'run'))
+    depends_on('py-setuptools', type=('build', 'run'))
+    depends_on('py-future', when='@1.5:', type=('build', 'run'))
+    depends_on('py-future', when='@1.1: ^python@:2', type=('build', 'run'))
+    depends_on('py-pyyaml', type=('build', 'run'))
+    depends_on('py-typing', when='@0.4: ^python@:3.4', type=('build', 'run'))
+    depends_on('py-typing-extensions', when='@1.7:', type=('build', 'run'))
+    depends_on('py-pybind11@2.6.2', when='@1.8.0:', type=('build', 'link', 'run'))
+    depends_on('py-pybind11@2.3.0', when='@1.1.0:1.7', type=('build', 'link', 'run'))
+    depends_on('py-pybind11@2.2.4', when='@1.0.0:1.0', type=('build', 'link', 'run'))
+    depends_on('py-pybind11@2.2.2', when='@0.4.0:0.4', type=('build', 'link', 'run'))
+    depends_on('py-dataclasses', when='@1.7: ^python@3.6.0:3.6', type=('build', 'run'))
+    depends_on('py-tqdm', type='run')
+    depends_on('py-protobuf', when='@0.4:', type=('build', 'run'))
+    depends_on('protobuf', when='@0.4:')
+    depends_on('blas')
+    depends_on('lapack')
+    depends_on('eigen', when='@0.4:')
     # https://github.com/pytorch/pytorch/issues/60329
     # depends_on('cpuinfo@2020-12-17', when='@1.8.0:')
     # depends_on('cpuinfo@2020-06-11', when='@1.6.0:1.7')
@@ -165,30 +152,30 @@ class PyTorch(PythonPackage, CudaPackage):
     # depends_on('sleef@3.4.0_2019-07-30', when='@1.6.0:1.7')
     # https://github.com/Maratyszcza/FP16/issues/18
     # depends_on('fp16@2020-05-14', when='@1.6.0:')
-    depends_on("pthreadpool@2021-04-13", when="@1.9.0:")
-    depends_on("pthreadpool@2020-10-05", when="@1.8.0:1.8")
-    depends_on("pthreadpool@2020-06-15", when="@1.6.0:1.7")
-    depends_on("psimd@2020-05-17", when="@1.6.0:")
-    depends_on("fxdiv@2020-04-17", when="@1.6.0:")
-    depends_on("benchmark", when="@1.6:+test")
+    depends_on('pthreadpool@2021-04-13', when='@1.9.0:')
+    depends_on('pthreadpool@2020-10-05', when='@1.8.0:1.8')
+    depends_on('pthreadpool@2020-06-15', when='@1.6.0:1.7')
+    depends_on('psimd@2020-05-17', when='@1.6.0:')
+    depends_on('fxdiv@2020-04-17', when='@1.6.0:')
+    depends_on('benchmark', when='@1.6:+test')
 
     # Optional dependencies
-    depends_on("cuda@7.5:", when="+cuda", type=("build", "link", "run"))
-    depends_on("cuda@9:", when="@1.1:+cuda", type=("build", "link", "run"))
-    depends_on("cuda@9.2:", when="@1.6:+cuda", type=("build", "link", "run"))
-    depends_on("cudnn@6.0:7", when="@:1.0+cudnn")
-    depends_on("cudnn@7.0:7", when="@1.1.0:1.5+cudnn")
-    depends_on("cudnn@7.0:", when="@1.6.0:+cudnn")
-    depends_on("magma", when="+magma")
-    depends_on("nccl", when="+nccl")
-    depends_on("numactl", when="+numa")
-    depends_on("py-numpy", when="+numpy", type=("build", "run"))
-    depends_on("llvm-openmp", when="%apple-clang +openmp")
-    depends_on("valgrind", when="+valgrind")
+    depends_on('cuda@7.5:', when='+cuda', type=('build', 'link', 'run'))
+    depends_on('cuda@9:', when='@1.1:+cuda', type=('build', 'link', 'run'))
+    depends_on('cuda@9.2:', when='@1.6:+cuda', type=('build', 'link', 'run'))
+    depends_on('cudnn@6.0:7', when='@:1.0+cudnn')
+    depends_on('cudnn@7.0:7', when='@1.1.0:1.5+cudnn')
+    depends_on('cudnn@7.0:', when='@1.6.0:+cudnn')
+    depends_on('magma', when='+magma')
+    depends_on('nccl', when='+nccl')
+    depends_on('numactl', when='+numa')
+    depends_on('py-numpy', when='+numpy', type=('build', 'run'))
+    depends_on('llvm-openmp', when='%apple-clang +openmp')
+    depends_on('valgrind', when='+valgrind')
     # https://github.com/pytorch/pytorch/issues/60332
     # depends_on('xnnpack@2021-02-22', when='@1.8.0:+xnnpack')
     # depends_on('xnnpack@2020-03-23', when='@1.6.0:1.7+xnnpack')
-    depends_on("mpi", when="+mpi")
+    depends_on('mpi', when='+mpi')
     # https://github.com/pytorch/pytorch/issues/60270
     # depends_on('gloo@2021-05-04', when='@1.9.0:+gloo')
     # depends_on('gloo@2020-09-18', when='@1.7.0:1.8+gloo')
@@ -196,35 +183,31 @@ class PyTorch(PythonPackage, CudaPackage):
     # https://github.com/pytorch/pytorch/issues/60331
     # depends_on('onnx@1.8.0_2020-11-03', when='@1.8.0:+onnx_ml')
     # depends_on('onnx@1.7.0_2020-05-31', when='@1.6.0:1.7+onnx_ml')
-    depends_on("mkl", when="+mkldnn")
+    depends_on('mkl', when='+mkldnn')
 
     # Test dependencies
-    depends_on("py-hypothesis", type="test")
-    depends_on("py-six", type="test")
-    depends_on("py-psutil", type="test")
+    depends_on('py-hypothesis', type='test')
+    depends_on('py-six', type='test')
+    depends_on('py-psutil', type='test')
 
     # Fix BLAS being overridden by MKL
     # https://github.com/pytorch/pytorch/issues/60328
-    patch(
-        "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/59220.patch",
-        sha256="e37afffe45cf7594c22050109942370e49983ad772d12ebccf508377dc9dcfc9",
-        when="@1.2.0:",
-    )
+    patch('https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/59220.patch',
+          sha256='e37afffe45cf7594c22050109942370e49983ad772d12ebccf508377dc9dcfc9',
+          when='@1.2.0:')
 
     # Fixes build on older systems with glibc <2.12
-    patch(
-        "https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/55063.patch",
-        sha256="e17eaa42f5d7c18bf0d7c37d7b0910127a01ad53fdce3e226a92893356a70395",
-        when="@1.1.0:1.8.1",
-    )
+    patch('https://patch-diff.githubusercontent.com/raw/pytorch/pytorch/pull/55063.patch',
+          sha256='e17eaa42f5d7c18bf0d7c37d7b0910127a01ad53fdce3e226a92893356a70395',
+          when='@1.1.0:1.8.1')
 
     # Fixes CMake configuration error when XNNPACK is disabled
     # https://github.com/pytorch/pytorch/pull/35607
     # https://github.com/pytorch/pytorch/pull/37865
-    patch("xnnpack.patch", when="@1.5.0:1.5")
+    patch('xnnpack.patch', when='@1.5.0:1.5')
 
     # Fixes build error when ROCm is enabled for pytorch-1.5 release
-    patch("rocm.patch", when="@1.5.0:1.5+rocm")
+    patch('rocm.patch', when='@1.5.0:1.5+rocm')
 
     # Fixes fatal error: sleef.h: No such file or directory
     # https://github.com/pytorch/pytorch/pull/35359
@@ -233,56 +216,47 @@ class PyTorch(PythonPackage, CudaPackage):
 
     # Fixes compilation with Clang 9.0.0 and Apple Clang 11.0.3
     # https://github.com/pytorch/pytorch/pull/37086
-    patch(
-        "https://github.com/pytorch/pytorch/commit/e921cd222a8fbeabf5a3e74e83e0d8dfb01aa8b5.patch",
-        sha256="17561b16cd2db22f10c0fe1fdcb428aecb0ac3964ba022a41343a6bb8cba7049",
-        when="@1.1:1.5",
-    )
+    patch('https://github.com/pytorch/pytorch/commit/e921cd222a8fbeabf5a3e74e83e0d8dfb01aa8b5.patch',
+          sha256='17561b16cd2db22f10c0fe1fdcb428aecb0ac3964ba022a41343a6bb8cba7049',
+          when='@1.1:1.5')
 
     # Removes duplicate definition of getCusparseErrorString
     # https://github.com/pytorch/pytorch/issues/32083
-    patch("cusparseGetErrorString.patch", when="@0.4.1:1.0^cuda@10.1.243:")
+    patch('cusparseGetErrorString.patch', when='@0.4.1:1.0^cuda@10.1.243:')
 
     # Fixes 'FindOpenMP.cmake'
     # to detect openmp settings used by Fujitsu compiler.
-    patch("detect_omp_of_fujitsu_compiler.patch", when="%fj")
+    patch('detect_omp_of_fujitsu_compiler.patch', when='%fj')
 
     # Fix compilation of +distributed~tensorpipe
     # https://github.com/pytorch/pytorch/issues/68002
-    patch(
-        "https://github.com/pytorch/pytorch/commit/c075f0f633fa0136e68f0a455b5b74d7b500865c.patch",
-        sha256="e69e41b5c171bfb00d1b5d4ee55dd5e4c8975483230274af4ab461acd37e40b8",
-        when="@1.10.0+distributed~tensorpipe",
-    )
+    patch('https://github.com/pytorch/pytorch/commit/c075f0f633fa0136e68f0a455b5b74d7b500865c.patch',
+          sha256='e69e41b5c171bfb00d1b5d4ee55dd5e4c8975483230274af4ab461acd37e40b8', when='@1.10.0+distributed~tensorpipe')
 
     # Both build and install run cmake/make/make install
     # Only run once to speed up build times
-    phases = ["install"]
+    phases = ['install']
 
     @property
     def libs(self):
-        root = join_path(
-            self.prefix, self.spec["python"].package.site_packages_dir, "torch", "lib"
-        )
-        return find_libraries("libtorch", root)
+        root = join_path(self.prefix, self.spec['python'].package.site_packages_dir,
+                         'torch', 'lib')
+        return find_libraries('libtorch', root)
 
     @property
     def headers(self):
-        root = join_path(
-            self.prefix, self.spec["python"].package.site_packages_dir, "torch", "include"
-        )
+        root = join_path(self.prefix, self.spec['python'].package.site_packages_dir,
+                         'torch', 'include')
         headers = find_all_headers(root)
         headers.directories = [root]
         return headers
 
-    @when("@1.5.0:")
+    @when('@1.5.0:')
     def patch(self):
         # https://github.com/pytorch/pytorch/issues/52208
-        filter_file(
-            "torch_global_deps PROPERTIES LINKER_LANGUAGE C",
-            "torch_global_deps PROPERTIES LINKER_LANGUAGE CXX",
-            "caffe2/CMakeLists.txt",
-        )
+        filter_file('torch_global_deps PROPERTIES LINKER_LANGUAGE C',
+                    'torch_global_deps PROPERTIES LINKER_LANGUAGE CXX',
+                    'caffe2/CMakeLists.txt')
 
     def setup_build_environment(self, env):
         """Set environment variables used to control the build.
@@ -295,8 +269,7 @@ class PyTorch(PythonPackage, CudaPackage):
         most flags defined in ``CMakeLists.txt`` can be specified as
         environment variables.
         """
-
-        def enable_or_disable(variant, keyword="USE", var=None, newer=False):
+        def enable_or_disable(variant, keyword='USE', var=None, newer=False):
             """Set environment variable to enable or disable support for a
             particular variant.
 
@@ -311,135 +284,137 @@ class PyTorch(PythonPackage, CudaPackage):
 
             # Version 1.1.0 switched from NO_* to USE_* or BUILD_*
             # But some newer variants have always used USE_* or BUILD_*
-            if self.spec.satisfies("@1.1:") or newer:
-                if "+" + variant in self.spec:
-                    env.set(keyword + "_" + var, "ON")
+            if self.spec.satisfies('@1.1:') or newer:
+                if '+' + variant in self.spec:
+                    env.set(keyword + '_' + var, 'ON')
                 else:
-                    env.set(keyword + "_" + var, "OFF")
+                    env.set(keyword + '_' + var, 'OFF')
             else:
-                if "+" + variant in self.spec:
-                    env.unset("NO_" + var)
+                if '+' + variant in self.spec:
+                    env.unset('NO_' + var)
                 else:
-                    env.set("NO_" + var, "ON")
+                    env.set('NO_' + var, 'ON')
 
         # Build in parallel to speed up build times
-        env.set("MAX_JOBS", make_jobs)
+        env.set('MAX_JOBS', make_jobs)
 
         # Spack logs have trouble handling colored output
-        env.set("COLORIZE_OUTPUT", "OFF")
+        env.set('COLORIZE_OUTPUT', 'OFF')
 
-        if self.spec.satisfies("@0.4:"):
-            enable_or_disable("test", keyword="BUILD")
+        if self.spec.satisfies('@0.4:'):
+            enable_or_disable('test', keyword='BUILD')
 
-        if self.spec.satisfies("@1.7:"):
-            enable_or_disable("caffe2", keyword="BUILD")
+        if self.spec.satisfies('@1.7:'):
+            enable_or_disable('caffe2', keyword='BUILD')
 
-        enable_or_disable("cuda")
-        if "+cuda" in self.spec:
+        enable_or_disable('cuda')
+        if '+cuda' in self.spec:
             # cmake/public/cuda.cmake
             # cmake/Modules_CUDA_fix/upstream/FindCUDA.cmake
-            env.unset("CUDA_ROOT")
-            torch_cuda_arch = ";".join(
-                "{0:.1f}".format(float(i) / 10.0) for i in self.spec.variants["cuda_arch"].value
-            )
-            env.set("TORCH_CUDA_ARCH_LIST", torch_cuda_arch)
+            env.unset('CUDA_ROOT')
+            torch_cuda_arch = ';'.join('{0:.1f}'.format(float(i) / 10.0) for i
+                                       in
+                                       self.spec.variants['cuda_arch'].value)
+            env.set('TORCH_CUDA_ARCH_LIST', torch_cuda_arch)
 
-        enable_or_disable("rocm")
+        enable_or_disable('rocm')
 
-        enable_or_disable("cudnn")
-        if "+cudnn" in self.spec:
+        enable_or_disable('cudnn')
+        if '+cudnn' in self.spec:
             # cmake/Modules_CUDA_fix/FindCUDNN.cmake
-            env.set("CUDNN_INCLUDE_DIR", self.spec["cudnn"].prefix.include)
-            env.set("CUDNN_LIBRARY", self.spec["cudnn"].libs[0])
+            env.set('CUDNN_INCLUDE_DIR', self.spec['cudnn'].prefix.include)
+            env.set('CUDNN_LIBRARY', self.spec['cudnn'].libs[0])
 
-        enable_or_disable("fbgemm")
-        if self.spec.satisfies("@1.8:"):
-            enable_or_disable("kineto")
-        enable_or_disable("magma")
-        enable_or_disable("metal")
-        if self.spec.satisfies("@1.10:"):
-            enable_or_disable("breakpad")
+        enable_or_disable('fbgemm')
+        if self.spec.satisfies('@1.8:'):
+            enable_or_disable('kineto')
+        enable_or_disable('magma')
+        enable_or_disable('metal')
+        if self.spec.satisfies('@1.10:'):
+            enable_or_disable('breakpad')
 
-        enable_or_disable("nccl")
-        if "+nccl" in self.spec:
-            env.set("NCCL_LIB_DIR", self.spec["nccl"].libs.directories[0])
-            env.set("NCCL_INCLUDE_DIR", self.spec["nccl"].prefix.include)
+        enable_or_disable('nccl')
+        if '+nccl' in self.spec:
+            env.set('NCCL_LIB_DIR', self.spec['nccl'].libs.directories[0])
+            env.set('NCCL_INCLUDE_DIR', self.spec['nccl'].prefix.include)
 
         # cmake/External/nnpack.cmake
-        enable_or_disable("nnpack")
+        enable_or_disable('nnpack')
 
-        enable_or_disable("numa")
-        if "+numa" in self.spec:
+        enable_or_disable('numa')
+        if '+numa' in self.spec:
             # cmake/Modules/FindNuma.cmake
-            env.set("NUMA_ROOT_DIR", self.spec["numactl"].prefix)
+            env.set('NUMA_ROOT_DIR', self.spec['numactl'].prefix)
 
         # cmake/Modules/FindNumPy.cmake
-        enable_or_disable("numpy")
+        enable_or_disable('numpy')
         # cmake/Modules/FindOpenMP.cmake
-        enable_or_disable("openmp", newer=True)
-        enable_or_disable("qnnpack")
-        if self.spec.satisfies("@1.3:"):
-            enable_or_disable("qnnpack", var="PYTORCH_QNNPACK")
-        if self.spec.satisfies("@1.8:"):
-            enable_or_disable("valgrind")
-        if self.spec.satisfies("@1.5:"):
-            enable_or_disable("xnnpack")
-        enable_or_disable("mkldnn")
-        enable_or_disable("distributed")
-        enable_or_disable("mpi")
+        enable_or_disable('openmp', newer=True)
+        enable_or_disable('qnnpack')
+        if self.spec.satisfies('@1.3:'):
+            enable_or_disable('qnnpack', var='PYTORCH_QNNPACK')
+        if self.spec.satisfies('@1.8:'):
+            enable_or_disable('valgrind')
+        if self.spec.satisfies('@1.5:'):
+            enable_or_disable('xnnpack')
+        enable_or_disable('mkldnn')
+        enable_or_disable('distributed')
+        enable_or_disable('mpi')
         # cmake/Modules/FindGloo.cmake
-        enable_or_disable("gloo", newer=True)
-        if self.spec.satisfies("@1.6:"):
-            enable_or_disable("tensorpipe")
+        enable_or_disable('gloo', newer=True)
+        if self.spec.satisfies('@1.6:'):
+            enable_or_disable('tensorpipe')
 
-        if "+onnx_ml" in self.spec:
-            env.set("ONNX_ML", "ON")
+        if '+onnx_ml' in self.spec:
+            env.set('ONNX_ML', 'ON')
         else:
-            env.set("ONNX_ML", "OFF")
+            env.set('ONNX_ML', 'OFF')
 
-        if not self.spec.satisfies("@master"):
-            env.set("PYTORCH_BUILD_VERSION", self.version)
-            env.set("PYTORCH_BUILD_NUMBER", 0)
+        if not self.spec.satisfies('@master'):
+            env.set('PYTORCH_BUILD_VERSION', self.version)
+            env.set('PYTORCH_BUILD_NUMBER', 0)
 
         # BLAS to be used by Caffe2
         # Options defined in cmake/Dependencies.cmake and cmake/Modules/FindBLAS.cmake
-        if self.spec["blas"].name == "atlas":
-            env.set("BLAS", "ATLAS")
-            env.set("WITH_BLAS", "atlas")
-        elif self.spec["blas"].name in ["blis", "amdblis"]:
-            env.set("BLAS", "BLIS")
-            env.set("WITH_BLAS", "blis")
-        elif self.spec["blas"].name == "eigen":
-            env.set("BLAS", "Eigen")
-        elif self.spec["lapack"].name in ["libflame", "amdlibflame"]:
-            env.set("BLAS", "FLAME")
-            env.set("WITH_BLAS", "FLAME")
-        elif self.spec["blas"].name in ["intel-mkl", "intel-parallel-studio", "intel-oneapi-mkl"]:
-            env.set("BLAS", "MKL")
-            env.set("WITH_BLAS", "mkl")
-        elif self.spec["blas"].name == "openblas":
-            env.set("BLAS", "OpenBLAS")
-            env.set("WITH_BLAS", "open")
-        elif self.spec["blas"].name == "veclibfort":
-            env.set("BLAS", "vecLib")
-            env.set("WITH_BLAS", "veclib")
+        if self.spec['blas'].name == 'atlas':
+            env.set('BLAS', 'ATLAS')
+            env.set('WITH_BLAS', 'atlas')
+        elif self.spec['blas'].name in ['blis', 'amdblis']:
+            env.set('BLAS', 'BLIS')
+            env.set('WITH_BLAS', 'blis')
+        elif self.spec['blas'].name == 'eigen':
+            env.set('BLAS', 'Eigen')
+        elif self.spec['lapack'].name in ['libflame', 'amdlibflame']:
+            env.set('BLAS', 'FLAME')
+            env.set('WITH_BLAS', 'FLAME')
+        elif self.spec['blas'].name in [
+                'intel-mkl', 'intel-parallel-studio', 'intel-oneapi-mkl']:
+            env.set('BLAS', 'MKL')
+            env.set('WITH_BLAS', 'mkl')
+        elif self.spec['blas'].name == 'openblas':
+            env.set('BLAS', 'OpenBLAS')
+            env.set('WITH_BLAS', 'open')
+        elif self.spec['blas'].name == 'veclibfort':
+            env.set('BLAS', 'vecLib')
+            env.set('WITH_BLAS', 'veclib')
         else:
-            env.set("BLAS", "Generic")
-            env.set("WITH_BLAS", "generic")
+            env.set('BLAS', 'Generic')
+            env.set('WITH_BLAS', 'generic')
 
         # Don't use vendored third-party libraries when possible
-        env.set("BUILD_CUSTOM_PROTOBUF", "OFF")
-        env.set("USE_SYSTEM_NCCL", "ON")
-        env.set("USE_SYSTEM_EIGEN_INSTALL", "ON")
-        if self.spec.satisfies("@0.4:"):
-            env.set("pybind11_DIR", self.spec["py-pybind11"].prefix)
-            env.set("pybind11_INCLUDE_DIR", self.spec["py-pybind11"].prefix.include)
-        if self.spec.satisfies("@1.10:"):
-            env.set("USE_SYSTEM_PYBIND11", "ON")
+        env.set('BUILD_CUSTOM_PROTOBUF', 'OFF')
+        env.set('USE_SYSTEM_NCCL', 'ON')
+        env.set('USE_SYSTEM_EIGEN_INSTALL', 'ON')
+        if self.spec.satisfies('@0.4:'):
+            env.set('pybind11_DIR', self.spec['py-pybind11'].prefix)
+            env.set('pybind11_INCLUDE_DIR',
+                    self.spec['py-pybind11'].prefix.include)
+        if self.spec.satisfies('@1.10:'):
+            env.set('USE_SYSTEM_PYBIND11', 'ON')
         # https://github.com/pytorch/pytorch/issues/60334
         # if self.spec.satisfies('@1.8:'):
         #     env.set('USE_SYSTEM_SLEEF', 'ON')
-        if self.spec.satisfies("@1.6:"):
+        if self.spec.satisfies('@1.6:'):
             # env.set('USE_SYSTEM_LIBS', 'ON')
             # https://github.com/pytorch/pytorch/issues/60329
             # env.set('USE_SYSTEM_CPUINFO', 'ON')
@@ -447,26 +422,27 @@ class PyTorch(PythonPackage, CudaPackage):
             # env.set('USE_SYSTEM_GLOO', 'ON')
             # https://github.com/Maratyszcza/FP16/issues/18
             # env.set('USE_SYSTEM_FP16', 'ON')
-            env.set("USE_SYSTEM_PTHREADPOOL", "ON")
-            env.set("USE_SYSTEM_PSIMD", "ON")
-            env.set("USE_SYSTEM_FXDIV", "ON")
-            env.set("USE_SYSTEM_BENCHMARK", "ON")
+            env.set('USE_SYSTEM_PTHREADPOOL', 'ON')
+            env.set('USE_SYSTEM_PSIMD', 'ON')
+            env.set('USE_SYSTEM_FXDIV', 'ON')
+            env.set('USE_SYSTEM_BENCHMARK', 'ON')
             # https://github.com/pytorch/pytorch/issues/60331
             # env.set('USE_SYSTEM_ONNX', 'ON')
             # https://github.com/pytorch/pytorch/issues/60332
             # env.set('USE_SYSTEM_XNNPACK', 'ON')
 
-    @run_before("install")
+    @run_before('install')
     def build_amd(self):
-        if "+rocm" in self.spec:
-            python(os.path.join("tools", "amd_build", "build_amd.py"))
+        if '+rocm' in self.spec:
+            python(os.path.join('tools', 'amd_build', 'build_amd.py'))
 
-    @run_after("install")
+    @run_after('install')
     @on_package_attributes(run_tests=True)
     def install_test(self):
-        with working_dir("test"):
-            python("run_test.py")
+        with working_dir('test'):
+            python('run_test.py')
 
     # Tests need to be re-added since `phases` was overridden
-    run_after("install")(PythonPackage._run_default_install_time_test_callbacks)
-    run_after("install")(PythonPackage.sanity_check_prefix)
+    run_after('install')(
+        PythonPackage._run_default_install_time_test_callbacks)
+    run_after('install')(PythonPackage.sanity_check_prefix)

lib/spack/spack/test/modules/lmod.py

@@ -45,6 +45,18 @@ def provider(request):
 
 @pytest.mark.usefixtures("config", "mock_packages")
 class TestLmod(object):
+    @pytest.mark.regression("37788")
+    @pytest.mark.parametrize("modules_config", ["core_compilers", "core_compilers_at_equal"])
+    def test_layout_for_specs_compiled_with_core_compilers(
+        self, modules_config, module_configuration, factory
+    ):
+        """Tests that specs compiled with core compilers are in the 'Core' folder. Also tests that
+        we can use both ``compiler@version`` and ``compiler@=version`` to specify a core compiler.
+        """
+        module_configuration(modules_config)
+        module, spec = factory("libelf%clang@12.0.0")
+        assert "Core" in module.layout.available_path_parts
+
     def test_file_layout(self, compiler, provider, factory, module_configuration):
         """Tests the layout of files in the hierarchy is the one expected."""
         module_configuration("complex_hierarchy")
@@ -61,7 +73,7 @@ def test_file_layout(self, compiler, provider, factory, module_configuration):
         # is transformed to r"Core" if the compiler is listed among core
         # compilers
         # Check that specs listed as core_specs are transformed to "Core"
-        if compiler == "clang@=3.3" or spec_string == "mpich@3.0.1":
+        if compiler == "clang@=12.0.0" or spec_string == "mpich@3.0.1":
             assert "Core" in layout.available_path_parts
         else:
             assert compiler.replace("@=", "/") in layout.available_path_parts

share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml

@@ -14,26 +14,6 @@ default:
     SPACK_TARGET_PLATFORM: "linux"
     SPACK_TARGET_ARCH: "x86_64_v3"
 
-.linux_skylake:
-  variables:
-    SPACK_TARGET_PLATFORM: "linux"
-    SPACK_TARGET_ARCH: "skylake_avx512"
-
-.linux_icelake:
-  variables:
-    SPACK_TARGET_PLATFORM: "linux"
-    SPACK_TARGET_ARCH: "icelake"
-
-.linux_neoverse_n1:
-  variables:
-    SPACK_TARGET_PLATFORM: "linux"
-    SPACK_TARGET_ARCH: "neoverse_n1"
-
-.linux_neoverse_v1:
-  variables:
-    SPACK_TARGET_PLATFORM: "linux"
-    SPACK_TARGET_ARCH: "neoverse_v1"
-
 .linux_aarch64:
   variables:
     SPACK_TARGET_PLATFORM: "linux"
@@ -782,103 +762,3 @@ deprecated-ci-build:
   needs:
     - artifacts: True
       job: deprecated-ci-generate
-
-########################################
-# AWS PCLUSTER
-########################################
-
-.aws-pcluster-generate-image:
-  image: { "name": "ghcr.io/spack/pcluster-amazonlinux-2:latest", "entrypoint": [""] }
-
-.aws-pcluster-generate:
-  before_script:
-      # Setup postinstall Spack as upstream installation
-    - - . "./share/spack/setup-env.sh"
-      - . /etc/profile.d/modules.sh
-      - if [[ -f /bootstrap/spack/etc/spack/packages.yaml ]]; then cp /bootstrap/spack/etc/spack/packages.yaml ./etc/spack/; fi
-      - if [[ -f /bootstrap/spack/etc/spack/config.yaml ]]; then cp /bootstrap/spack/etc/spack/config.yaml ./etc/spack/; fi
-      - if [[ -f /bootstrap/spack/etc/spack/modules.xyaml ]]; then cp /bootstrap/spack/etc/spack/modules.yaml ./etc/spack/; fi
-      - if [[ -f /bootstrap/spack/etc/spack/mirrors.yaml ]]; then cp /bootstrap/spack/etc/spack/mirrors.yaml ./etc/spack/; fi
-      - if [[ -d /bootstrap/spack/opt/spack ]]; then spack config add "upstreams:postinstall:install_tree:/bootstrap/spack/opt/spack"; fi
-      - cd "${CI_PROJECT_DIR}" && curl -sOL https://raw.githubusercontent.com/spack/spack-configs/main/AWS/parallelcluster/postinstall.sh
-      - sed -i -e '/nohup/s/&$//' -e 's/nohup//' -e "s/spack arch -t/echo ${SPACK_TARGET_ARCH}/g" postinstall.sh
-      - /bin/bash postinstall.sh -fg
-      - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\""
-  after_script:
-    - - mv "${CI_PROJECT_DIR}/postinstall.sh" "${CI_PROJECT_DIR}/jobs_scratch_dir/"
-
-# Icelake (one pipeline per target)
-.aws-pcluster-icelake:
-  variables:
-    SPACK_CI_STACK_NAME: aws-pcluster-icelake
-
-aws-pcluster-generate-icelake:
-  extends: [ ".linux_icelake", ".aws-pcluster-icelake", ".generate", ".tags-x86_64_v4", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
-
-aws-pcluster-build-icelake:
-  extends: [ ".linux_icelake", ".aws-pcluster-icelake", ".build" ]
-  trigger:
-    include:
-      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-        job: aws-pcluster-generate-icelake
-    strategy: depend
-  needs:
-    - artifacts: True
-      job: aws-pcluster-generate-icelake
-
-# Skylake_avx512 (one pipeline per target)
-.aws-pcluster-skylake:
-  variables:
-    SPACK_CI_STACK_NAME: aws-pcluster-skylake
-
-aws-pcluster-generate-skylake:
-  extends: [ ".linux_skylake", ".aws-pcluster-skylake", ".generate", ".tags-x86_64_v4", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
-
-aws-pcluster-build-skylake:
-  extends: [ ".linux_skylake", ".aws-pcluster-skylake", ".build" ]
-  trigger:
-    include:
-      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-        job: aws-pcluster-generate-skylake
-    strategy: depend
-  needs:
-    - artifacts: True
-      job: aws-pcluster-generate-skylake
-
-# Neoverse_n1 (one pipeline per target)
-.aws-pcluster-neoverse_n1:
-  variables:
-    SPACK_CI_STACK_NAME: aws-pcluster-neoverse_n1
-
-aws-pcluster-generate-neoverse_n1:
-  extends: [ ".linux_neoverse_n1", ".aws-pcluster-neoverse_n1", ".generate-aarch64", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
-
-aws-pcluster-build-neoverse_n1:
-  extends: [  ".linux_neoverse_n1", ".aws-pcluster-neoverse_n1", ".build" ]
-  trigger:
-    include:
-      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-        job: aws-pcluster-generate-neoverse_n1
-    strategy: depend
-  needs:
-    - artifacts: True
-      job: aws-pcluster-generate-neoverse_n1
-
-# Neoverse_v1 (one pipeline per target)
-.aws-pcluster-neoverse_v1:
-  variables:
-    SPACK_CI_STACK_NAME: aws-pcluster-neoverse_v1
-
-aws-pcluster-generate-neoverse_v1:
-  extends: [ ".linux_neoverse_v1", ".aws-pcluster-neoverse_v1", ".generate-aarch64", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
-
-aws-pcluster-build-neoverse_v1:
-  extends: [  ".linux_neoverse_v1", ".aws-pcluster-neoverse_v1", ".build" ]
-  trigger:
-    include:
-      - artifact: jobs_scratch_dir/cloud-ci-pipeline.yml
-        job: aws-pcluster-generate-neoverse_v1
-    strategy: depend
-  needs:
-    - artifacts: True
-      job: aws-pcluster-generate-neoverse_v1

share/spack/gitlab/cloud_pipelines/configs/linux/icelake/ci.yaml

@@ -1,11 +0,0 @@
-ci:
-  pipeline-gen:
-  - any-job:
-      variables:
-        SPACK_TARGET_ARCH: icelake
-  - build-job:
-      before_script:
-      - - curl -LfsS "https://github.com/JuliaBinaryWrappers/GNUMake_jll.jl/releases/download/GNUMake-v4.3.0+1/GNUMake.v4.3.0.x86_64-linux-gnu.tar.gz" -o gmake.tar.gz
-        - printf "fef1f59e56d2d11e6d700ba22d3444b6e583c663d6883fd0a4f63ab8bd280f0f gmake.tar.gz" | sha256sum --check --strict --quiet
-        - tar -xzf gmake.tar.gz -C /usr bin/make 2> /dev/null
-      tags: ["x86_64_v4"]

share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_n1/ci.yaml

@@ -1,7 +0,0 @@
-ci:
-  pipeline-gen:
-  - any-job:
-      variables:
-        SPACK_TARGET_ARCH: neoverse_n1
-  - build-job:
-      tags: ["aarch64", "graviton2"]

share/spack/gitlab/cloud_pipelines/configs/linux/neoverse_v1/ci.yaml

@@ -1,7 +0,0 @@
-ci:
-  pipeline-gen:
-  - any-job:
-      variables:
-        SPACK_TARGET_ARCH: neoverse_v1
-  - build-job:
-      tags: ["aarch64", "graviton3"]

share/spack/gitlab/cloud_pipelines/configs/linux/skylake_avx512/ci.yaml

@@ -1,11 +0,0 @@
-ci:
-  pipeline-gen:
-  - any-job:
-      variables:
-        SPACK_TARGET_ARCH: skylake_avx512
-  - build-job:
-      before_script:
-      - - curl -LfsS "https://github.com/JuliaBinaryWrappers/GNUMake_jll.jl/releases/download/GNUMake-v4.3.0+1/GNUMake.v4.3.0.x86_64-linux-gnu.tar.gz" -o gmake.tar.gz
-        - printf "fef1f59e56d2d11e6d700ba22d3444b6e583c663d6883fd0a4f63ab8bd280f0f gmake.tar.gz" | sha256sum --check --strict --quiet
-        - tar -xzf gmake.tar.gz -C /usr bin/make 2> /dev/null
-      tags: ["x86_64_v4"]

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-icelake/spack.yaml

@@ -1,58 +0,0 @@
-spack:
-  view: false
-
-  definitions:
-  - compiler_specs:
-    - gcc
-    - gettext
-
-  - compiler_target:
-    - '%gcc@7.3.1 target=x86_64_v3'
-
-  - optimized_configs:
-    # - gromacs
-    - lammps
-    # - mpas-model
-    - openfoam
-    # - palace
-    # - py-devito
-    # - quantum-espresso
-    # - wrf
-
-  - optimized_libs:
-    - mpich
-    - openmpi
-
-  specs:
-  - matrix:
-    - - $compiler_specs
-    - - $compiler_target
-  - $optimized_configs
-  # - $optimized_libs
-
-  mirrors: { "mirror": "s3://spack-binaries/develop/aws-pcluster-icelake" }
-
-  ci:
-    pipeline-gen:
-    - build-job:
-        image: { "name": "ghcr.io/spack/pcluster-amazonlinux-2:latest", "entrypoint": [""] }
-        before_script:
-        - - . "./share/spack/setup-env.sh"
-          - . /etc/profile.d/modules.sh
-          - spack --version
-          - spack arch
-        # Setup postinstall Spack as upstream installation
-        - - if [[ -f /bootstrap/spack/etc/spack/packages.yaml ]]; then cp /bootstrap/spack/etc/spack/packages.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/config.yaml ]]; then cp /bootstrap/spack/etc/spack/config.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/modules.yaml ]]; then cp /bootstrap/spack/etc/spack/modules.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/mirrors.yaml ]]; then cp /bootstrap/spack/etc/spack/mirrors.yaml ./etc/spack/; fi
-          - if [[ -d /bootstrap/spack/opt/spack ]]; then spack config add "upstreams:postinstall:install_tree:/bootstrap/spack/opt/spack"; fi
-        - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg
-          - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\""
-    - signing-job:
-        before_script:
-          # Do not distribute Intel & ARM binaries
-          - - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep intel-oneapi | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-            - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-  cdash:
-    build-group: AWS Packages

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_n1/spack.yaml

@@ -1,61 +0,0 @@
-spack:
-  view: false
-
-  definitions:
-  - compiler_specs:
-    - gcc
-    - gettext
-
-  - compiler_target:
-    - '%gcc@7.3.1 target=aarch64'
-
-  - optimized_configs:
-    - gromacs
-    # - lammps
-    # - mpas-model
-    - openfoam
-    - palace
-    # - py-devito
-    - quantum-espresso
-    # - wrf
-
-  - optimized_libs:
-    - mpich
-    - openmpi
-
-  specs:
-  - matrix:
-    - - $compiler_specs
-    - - $compiler_target
-  - $optimized_configs
-  - $optimized_libs
-
-
-  mirrors: { "mirror": "s3://spack-binaries/develop/aws-pcluster-neoverse_n1" }
-
-  ci:
-    pipeline-gen:
-    - build-job:
-        image: { "name": "ghcr.io/spack/pcluster-amazonlinux-2:latest", "entrypoint": [""] }
-        tags: ["aarch64"]
-        before_script:
-        - - . "./share/spack/setup-env.sh"
-          - . /etc/profile.d/modules.sh
-          - spack --version
-          - spack arch
-        # Setup postinstall Spack as upstream installation
-        - - if [[ -f /bootstrap/spack/etc/spack/packages.yaml ]]; then cp /bootstrap/spack/etc/spack/packages.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/config.yaml ]]; then cp /bootstrap/spack/etc/spack/config.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/modules.yaml ]]; then cp /bootstrap/spack/etc/spack/modules.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/mirrors.yaml ]]; then cp /bootstrap/spack/etc/spack/mirrors.yaml ./etc/spack/; fi
-          - if [[ -d /bootstrap/spack/opt/spack ]]; then spack config add "upstreams:postinstall:install_tree:/bootstrap/spack/opt/spack"; fi
-        - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg
-          - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\""
-    - signing-job:
-        before_script:
-          # Do not distribute Intel & ARM binaries
-          - - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep intel-oneapi | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-            - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-
-  cdash:
-    build-group: AWS Packages

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-neoverse_v1/spack.yaml

@@ -1,61 +0,0 @@
-spack:
-  view: false
-
-  definitions:
-  - compiler_specs:
-    - gcc
-    - gettext
-
-  - compiler_target:
-    - '%gcc@7.3.1 target=aarch64'
-
-  - optimized_configs:
-    - gromacs
-    # - lammps
-    # - mpas-model
-    - openfoam
-    - palace
-    # - py-devito
-    - quantum-espresso
-    # - wrf
-
-  - optimized_libs:
-    - mpich
-    - openmpi
-
-  specs:
-  - matrix:
-    - - $compiler_specs
-    - - $compiler_target
-  - $optimized_configs
-  - $optimized_libs
-
-
-  mirrors: { "mirror": "s3://spack-binaries/develop/aws-pcluster-neoverse_v1" }
-
-  ci:
-    pipeline-gen:
-    - build-job:
-        image: { "name": "ghcr.io/spack/pcluster-amazonlinux-2:latest", "entrypoint": [""] }
-        tags: ["aarch64"]
-        before_script:
-        - - . "./share/spack/setup-env.sh"
-          - . /etc/profile.d/modules.sh
-          - spack --version
-          - spack arch
-        # Setup postinstall Spack as upstream installation
-        - - if [[ -f /bootstrap/spack/etc/spack/packages.yaml ]]; then cp /bootstrap/spack/etc/spack/packages.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/config.yaml ]]; then cp /bootstrap/spack/etc/spack/config.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/modules.yaml ]]; then cp /bootstrap/spack/etc/spack/modules.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/mirrors.yaml ]]; then cp /bootstrap/spack/etc/spack/mirrors.yaml ./etc/spack/; fi
-          - if [[ -d /bootstrap/spack/opt/spack ]]; then spack config add "upstreams:postinstall:install_tree:/bootstrap/spack/opt/spack"; fi
-        - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg
-          - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\""
-    - signing-job:
-        before_script:
-          # Do not distribute Intel & ARM binaries
-          - - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep intel-oneapi | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-            - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-
-  cdash:
-    build-group: AWS Packages

share/spack/gitlab/cloud_pipelines/stacks/aws-pcluster-skylake/spack.yaml

@@ -1,58 +0,0 @@
-spack:
-  view: false
-
-  definitions:
-  - compiler_specs:
-    - gcc
-    - gettext
-
-  - compiler_target:
-    - '%gcc@7.3.1 target=x86_64_v3'
-
-  - optimized_configs:
-    # - gromacs
-    - lammps
-    # - mpas-model
-    - openfoam
-    # - palace
-    # - py-devito
-    # - quantum-espresso
-    # - wrf
-
-  - optimized_libs:
-    - mpich
-    - openmpi
-
-  specs:
-  - matrix:
-    - - $compiler_specs
-    - - $compiler_target
-  - $optimized_configs
-  # - $optimized_libs
-
-  mirrors: { "mirror": "s3://spack-binaries/develop/aws-pcluster-skylake" }
-
-  ci:
-    pipeline-gen:
-    - build-job:
-        image: { "name": "ghcr.io/spack/pcluster-amazonlinux-2:latest", "entrypoint": [""] }
-        before_script:
-        - - . "./share/spack/setup-env.sh"
-          - . /etc/profile.d/modules.sh
-          - spack --version
-          - spack arch
-        # Setup postinstall Spack as upstream installation
-        - - if [[ -f /bootstrap/spack/etc/spack/packages.yaml ]]; then cp /bootstrap/spack/etc/spack/packages.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/config.yaml ]]; then cp /bootstrap/spack/etc/spack/config.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/modules.yaml ]]; then cp /bootstrap/spack/etc/spack/modules.yaml ./etc/spack/; fi
-          - if [[ -f /bootstrap/spack/etc/spack/mirrors.yaml ]]; then cp /bootstrap/spack/etc/spack/mirrors.yaml ./etc/spack/; fi
-          - if [[ -d /bootstrap/spack/opt/spack ]]; then spack config add "upstreams:postinstall:install_tree:/bootstrap/spack/opt/spack"; fi
-        - - /bin/bash "${SPACK_ARTIFACTS_ROOT}/postinstall.sh" -fg
-          - spack config --scope site add "packages:all:target:\"target=${SPACK_TARGET_ARCH}\""
-    - signing-job:
-        before_script:
-          # Do not distribute Intel & ARM binaries
-          - - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep intel-oneapi | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-            - for i in $(aws s3 ls --recursive ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/ | grep armpl | awk '{print $4}' | sed -e 's?^.*build_cache/??g'); do aws s3 rm ${SPACK_REMOTE_MIRROR_OVERRIDE}/build_cache/$i; done
-  cdash:
-    build-group: AWS Packages

share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml

@@ -71,7 +71,7 @@ spack:
   - conduit
   - datatransferkit
   - dyninst
-  - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc ~visit +vtkm +zfp ^hdf5@1.14
+  - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc +visit +vtkm +zfp
   - exaworks
   - flecsi
   - flit
@@ -165,7 +165,7 @@ spack:
   - chai ~benchmarks ~tests +cuda ^umpire ~shared
   - cusz +cuda
   - dealii +cuda
-  - ecp-data-vis-sdk +cuda ~ascent +adios2 +hdf5 +paraview +sz +vtkm +zfp  ^hdf5@1.14 # Removing ascent because RAJA build failure
+  - ecp-data-vis-sdk +cuda +adios2 +hdf5 +paraview +vtkm +zfp # Removing ascent because Dray is hung in CI. +ascent
   - flecsi +cuda
   - flux-core +cuda
   - ginkgo +cuda
@@ -199,7 +199,7 @@ spack:
   - cabana +rocm
   - caliper +rocm
   - chai ~benchmarks +rocm
-  - ecp-data-vis-sdk +adios2 +hdf5 +paraview +pnetcdf +sz +vtkm +zfp +rocm ^hdf5@1.14 # Excludes ascent for now due to C++ standard issues
+  - ecp-data-vis-sdk +paraview +vtkm +rocm
   - gasnet +rocm
   - ginkgo +rocm
   - heffte +rocm

var/spack/repos/builtin/packages/actsvg/package.py

@@ -18,7 +18,6 @@ class Actsvg(CMakePackage):
 
     maintainers("HadrienG2", "wdconinc")
 
-    version("0.4.33", sha256="25c93b8382bdb1864b4d8de64b146fe8ea86eec84048d594c375700d2fff1d1d")
     version("0.4.30", sha256="f7ffea39b3132914fcbb0fac6ab7395bef295cd6078dfd1c2509fd2d9aab0acb")
     version("0.4.29", sha256="971f4f344c3143b654e6a86422534c6916f785f2c2c3785664c4ae7ddf2f5e4b")
     version("0.4.28", sha256="12c6f0c41b1aeb21164c949498819976bf91a395968debcb400539713bdfc6b0")

var/spack/repos/builtin/packages/alluxio/package.py

@@ -17,7 +17,6 @@ class Alluxio(Package):
     list_url = "https://downloads.alluxio.io/downloads/files"
     list_depth = 1
 
-    version("2.9.3", sha256="c71abc5e852d37cfd6b1dea076f056c6997e3f60fbb940bf005acb3a6354a369")
     version("2.9.1", sha256="e9456db7a08488af22dee3a44e4135bc03a0444e31c7753bf00f72465f68ffb9")
 
     # https://nvd.nist.gov/vuln/detail/CVE-2022-23848

var/spack/repos/builtin/packages/aluminum/package.py

@@ -25,7 +25,6 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage):
     maintainers("bvanessen")
 
     version("master", branch="master")
-    version("1.3.1", sha256="28ce0af6c6f29f97b7f19c5e45184bd2f8a0b1428f1e898b027d96d47cb74b0b")
     version("1.3.0", sha256="d0442efbebfdfb89eec793ae65eceb8f1ba65afa9f2e48df009f81985a4c27e3")
     version("1.2.3", sha256="9b214bdf30f9b7e8e017f83e6615db6be2631f5be3dd186205dbe3aa62f4018a")
     version(

var/spack/repos/builtin/packages/amrfinder/package.py

@@ -18,7 +18,6 @@ class Amrfinder(MakefilePackage):
     homepage = "https://github.com/ncbi/amr/wiki"
     url = "https://github.com/ncbi/amr/archive/refs/tags/amrfinder_v3.10.30.tar.gz"
 
-    version("3.11.8", sha256="8aac87595f28d0ba54ed3e97a1c033f9769a9b03e0aba78bc29cf6aff0cf45d1")
     version("3.10.42", sha256="97254f8d6217a4618b7f29c05acbcfe0240ee5e98458f8da7df3840b4be39c1b")
     version("3.10.30", sha256="2f1e30b86935a27cee740bd7229a41fbce278f2f60b33b8e51592bab8bdf23f1")
     version("3.10.24", sha256="fce299c980cda740dcc4f53f9b2dc9061c856213e5bdbc2c339185a5fb7dcf6a")

var/spack/repos/builtin/packages/armcomputelibrary/package.py

@@ -30,7 +30,7 @@ class Armcomputelibrary(SConsPackage):
     url = "https://github.com/ARM-software/ComputeLibrary/archive/refs/tags/v23.02.zip"
     git = "https://github.com/ARM-software/ComputeLibrary.git"
 
-    maintainers("annop-w")
+    maintainers = ["annop-w"]
 
     version("23.02", sha256="bed1b24047ce00155e552204bc3983e86f46775414c554a34a7ece931d67ec62")
     version("22.11", sha256="2f70f54d84390625222503ea38650c00c49d4b70bc86a6b9aeeebee9d243865f")

var/spack/repos/builtin/packages/ascent/package.py

@@ -183,8 +183,6 @@ class Ascent(CMakePackage, CudaPackage):
     depends_on("vtk-m+cuda", when="@0.9.0: +vtkh+cuda")
     depends_on("vtk-m+fpic", when="@0.8.0: +vtkh")
     depends_on("vtk-m~shared+fpic", when="@0.8.0: +vtkh~shared")
-    # Ascent defaults to C++11
-    depends_on("kokkos std=11", when="+vtkh ^vtk-m +kokkos")
 
     #######################
     # VTK-h

var/spack/repos/builtin/packages/audit-userspace/package.py

@@ -12,7 +12,6 @@ class AuditUserspace(AutotoolsPackage):
     homepage = "https://github.com/linux-audit/audit-userspace"
     url = "https://github.com/linux-audit/audit-userspace/archive/v2.8.5.tar.gz"
 
-    version("3.1.1", sha256="6a97cc472920639d736e9927353be05e323f351067fcf6e5d34439cafa0e9006")
     version("2.8.5", sha256="835ffdd65056ba0c26509dbf48882713b00dbe70e1d8cf25d538501136c2e3e9")
     version("2.8.4", sha256="089dfdceb38edf056202a6de4892fd0c9aaa964c08bd7806c5d0c7c33f09e18d")
     version("2.8.3", sha256="c239e3813b84bc264aaf2f796c131c1fe02960244f789ec2bd8d88aad4561b29")

var/spack/repos/builtin/packages/babelstream/package.py

@@ -25,7 +25,7 @@ class Babelstream(CMakePackage, CudaPackage, ROCmPackage):
     version("4.0", sha256="a9cd39277fb15d977d468435eb9b894f79f468233f0131509aa540ffda4f5953")
     version("main", branch="main")
     version("develop", branch="develop")
-    maintainers("tomdeakin", "kaanolgu" "tom91136", "robj0nes")
+    maintainers = ["tomdeakin", "kaanolgu" "tom91136", "robj0nes"]
 
     # Languages
     # Also supported variants are cuda and rocm (for HIP)

var/spack/repos/builtin/packages/babl/package.py

@@ -19,7 +19,6 @@ class Babl(MesonPackage):
 
     maintainers("benkirk")
 
-    version("0.1.106", sha256="d325135d3304f088c134cc620013acf035de2e5d125a50a2d91054e7377c415f")
     version("0.1.102", sha256="a88bb28506575f95158c8c89df6e23686e50c8b9fea412bf49fe8b80002d84f0")
     version("0.1.98", sha256="f3b222f84e462735de63fa9c3651942f2b78fd314c73a22e05ff7c73afd23af1")
     version("0.1.96", sha256="33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6")

var/spack/repos/builtin/packages/bat/package.py

@@ -12,7 +12,6 @@ class Bat(Package):
     homepage = "https://github.com/sharkdp/bat"
     url = "https://github.com/sharkdp/bat/archive/v0.13.0.tar.gz"
 
-    version("0.23.0", sha256="30b6256bea0143caebd08256e0a605280afbbc5eef7ce692f84621eb232a9b31")
     version("0.21.0", sha256="3dff1e52d577d0a105f4afe3fe7722a4a2b8bb2eb3e7a6a5284ac7add586a3ee")
     version("0.13.0", sha256="f4aee370013e2a3bc84c405738ed0ab6e334d3a9f22c18031a7ea008cd5abd2a")
     version("0.12.1", sha256="1dd184ddc9e5228ba94d19afc0b8b440bfc1819fef8133fe331e2c0ec9e3f8e2")

var/spack/repos/builtin/packages/bdii/package.py

@@ -17,7 +17,6 @@ class Bdii(MakefilePackage):
     homepage = "https://github.com/EGI-Foundation/bdii"
     url = "https://github.com/EGI-Foundation/bdii/archive/v5.2.25.tar.gz"
 
-    version("6.0.1", sha256="ac292559004881c4d5254517207a5da82d7a48af746194a380145dcedef507ce")
     version("5.2.25", sha256="6abc3ed872538a12dc470a1d30bf4ae1ca4d6302eb6b50370413940f9e9259ca")
     version("5.2.24", sha256="5d09ed06b8b09ce372b3489fab93e25302f68ca80d8fcc600c2535648c861a3a")
 

var/spack/repos/builtin/packages/beast-tracer/package.py

@@ -15,7 +15,6 @@ class BeastTracer(Package):
     homepage = "https://beast.community/tracer"
     url = "https://github.com/beast-dev/tracer/archive/v1.7.1.tar.gz"
 
-    version("1.7.2", sha256="fd891e2244445fef71ab8010d8fab924abff2e5436e035bb335834e7c2e6d83b")
     version("1.7.1", sha256="947d51c5afa52354099b9b182ba6036e352356bd62df94031f33cdcb7e8effd3")
 
     depends_on("ant", type="build")

var/spack/repos/builtin/packages/c-raft/package.py

@@ -14,7 +14,7 @@ class CRaft(AutotoolsPackage):
     git = "https://github.com/canonical/raft.git"
     url = "https://github.com/canonical/raft/archive/refs/tags/v0.17.1.tar.gz"
 
-    maintainers("mdorier")
+    maintainers = ["mdorier"]
 
     version("master", branch="master")
     version("0.17.1", sha256="e31c7fafbdd5f94913161c5d64341a203364e512524b47295c97a91e83c4198b")

var/spack/repos/builtin/packages/canal/package.py

@@ -13,7 +13,6 @@ class Canal(MavenPackage):
     homepage = "https://github.com/alibaba/canal/wiki"
     url = "https://github.com/alibaba/canal/archive/canal-1.1.4.tar.gz"
 
-    version("1.1.6", sha256="2dd0997a69811a464e3d963e444760696931beb9326726b0064ad42f8a00c71b")
     version("1.1.4", sha256="740e0adac56d7f281cba21eca173eef3e8d42aa3e0fb49709f92cb6a1451dfbc")
     version("1.1.3", sha256="3fe75ca5eb5cb97eb35818426c1427542ccddb0de052cf154e948ef321822cbc")
     version("1.1.2", sha256="097190f952bdf09b835ed68966f5a98fa8308322a6aab11c1bfd16cec1800cf2")

var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py

@@ -17,7 +17,7 @@ class CbtfArgonavisGui(QMakePackage):
     homepage = "https://sourceforge.net/p/cbtf/wiki/Home/"
     git = "https://github.com/OpenSpeedShop/cbtf-argonavis-gui.git"
 
-    maintainers("jgalarowicz")
+    maintainers = ["jgalarowicz"]
 
     version("develop", branch="master")
     version("1.3.0.0", branch="1.3.0.0")

var/spack/repos/builtin/packages/cbtf-argonavis/package.py

@@ -15,7 +15,7 @@ class CbtfArgonavis(CMakePackage):
     homepage = "https://sourceforge.net/p/cbtf/wiki/Home/"
     git = "https://github.com/OpenSpeedShop/cbtf-argonavis.git"
 
-    maintainers("jgalarowicz")
+    maintainers = ["jgalarowicz"]
 
     version("develop", branch="master")
     version("1.9.4.1", branch="1.9.4.1")

var/spack/repos/builtin/packages/cbtf-krell/package.py

@@ -18,7 +18,7 @@ class CbtfKrell(CMakePackage):
     homepage = "https://sourceforge.net/p/cbtf/wiki/Home/"
     git = "https://github.com/OpenSpeedShop/cbtf-krell.git"
 
-    maintainers("jgalarowicz")
+    maintainers = ["jgalarowicz"]
 
     version("develop", branch="master")
     version("1.9.4.1", branch="1.9.4.1")

var/spack/repos/builtin/packages/cbtf-lanl/package.py

@@ -13,7 +13,7 @@ class CbtfLanl(CMakePackage):
     homepage = "https://sourceforge.net/p/cbtf/wiki/Home/"
     git = "https://github.com/OpenSpeedShop/cbtf-lanl.git"
 
-    maintainers("jgalarowicz")
+    maintainers = ["jgalarowicz"]
 
     version("develop", branch="master")
     version("1.9.4.1", branch="1.9.4.1")

var/spack/repos/builtin/packages/cbtf/package.py

@@ -18,7 +18,7 @@ class Cbtf(CMakePackage):
     homepage = "https://sourceforge.net/p/cbtf/wiki/Home"
     git = "https://github.com/OpenSpeedShop/cbtf.git"
 
-    maintainers("jgalarowicz")
+    maintainers = ["jgalarowicz"]
 
     version("develop", branch="master")
     version("1.9.4.1", branch="1.9.4.1")

var/spack/repos/builtin/packages/celeritas/package.py

@@ -17,12 +17,7 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
 
     maintainers("sethrj")
 
-    version("0.2.2", sha256="ba5e341d636e00e3d7dbac13a2016b97014917489f46b8b387a2adf9d9563872")
-    version(
-        "0.2.1",
-        sha256="b3717b43f70dd0da848139da4171ca7a887bb6777908845b6d953d47b1f4db41",
-        deprecated=True,
-    )
+    version("0.2.1", sha256="b3717b43f70dd0da848139da4171ca7a887bb6777908845b6d953d47b1f4db41")
     version(
         "0.2.0",
         sha256="12af28fda0e482a9eba89781b4ead445cf6f170bc1b8d88cc814e49b1ec09e9f",

var/spack/repos/builtin/packages/circos/package.py

@@ -14,7 +14,6 @@ class Circos(Package):
     homepage = "http://circos.ca/"
     url = "http://circos.ca/distribution/circos-0.69-6.tgz"
 
-    version("0.69-9", sha256="34d8d7ebebf3f553d62820f8f4a0a57814b610341f836b4740c46c3057f789d2")
     version("0.69-6", sha256="52d29bfd294992199f738a8d546a49754b0125319a1685a28daca71348291566")
 
     depends_on("perl", type="run")

var/spack/repos/builtin/packages/code-server/package.py

@@ -13,7 +13,6 @@ class CodeServer(Package):
     homepage = "https://coder.com/docs/code-server/latest"
     url = "https://github.com/coder/code-server/releases/download/v4.4.0/code-server-4.4.0-linux-amd64.tar.gz"
 
-    version("4.12.0", sha256="d50ee947c4144a6ff2656e664ecbb3f70b75168b8a6e8c3eef47787f3c240c26")
     version("4.11.0", sha256="4eb233054941ec298caec6fc84dfba0a72c1bc5fadc0fe4896b10f3f4a291d51")
     version("4.10.1", sha256="f34ce611a9c058982a5e9d200fdf009788e3a564e970b053f4145574bce21b09")
     version("4.4.0", sha256="e3dd265acb18c2230c72d19bbce619ac5c1bd800ebb26e5e169c4d613069500d")

var/spack/repos/builtin/packages/codec2/package.py

@@ -14,6 +14,5 @@ class Codec2(CMakePackage):
     homepage = "https://www.rowetel.com/?page_id=452"
     url = "https://github.com/drowe67/codec2/archive/v0.9.2.tar.gz"
 
-    version("1.1.0", sha256="d56ba661008a780b823d576a5a2742c94d0b0507574643a7d4f54c76134826a3")
     version("1.0.5", sha256="cd9a065dd1c3477f6172a0156294f767688847e4d170103d1f08b3a075f82826")
     version("0.9.2", sha256="19181a446f4df3e6d616b50cabdac4485abb9cd3242cf312a0785f892ed4c76c")

var/spack/repos/builtin/packages/coinutils/package.py

@@ -14,7 +14,6 @@ class Coinutils(AutotoolsPackage):
     homepage = "https://projects.coin-or.org/Coinutils"
     url = "https://github.com/coin-or/CoinUtils/archive/releases/2.11.4.tar.gz"
 
-    version("2.11.9", sha256="15d572ace4cd3b7c8ce117081b65a2bd5b5a4ebaba54fadc99c7a244160f88b8")
     version("2.11.6", sha256="6ea31d5214f7eb27fa3ffb2bdad7ec96499dd2aaaeb4a7d0abd90ef852fc79ca")
     version("2.11.4", sha256="d4effff4452e73356eed9f889efd9c44fe9cd68bd37b608a5ebb2c58bd45ef81")
 

var/spack/repos/builtin/packages/cpp-httplib/package.py

@@ -12,7 +12,6 @@ class CppHttplib(CMakePackage):
     homepage = "https://github.com/yhirose/cpp-httplib/"
     url = "https://github.com/yhirose/cpp-httplib/archive/v0.5.10.tar.gz"
 
-    version("0.12.3", sha256="175ced3c9cdaf221e9edf210297568d8f7d402a41d6db01254ac9e0b25487c54")
     version("0.5.9", sha256="c9e7aef3b0d4e80ee533d10413508d8a6e09a67d0d59646c43111f3993de006e")
     version("0.5.8", sha256="184d4fe79fc836ee26aa8635b3240879af4c6f17257fc7063d0b77a0cf856dfc")
     version("0.5.7", sha256="27b7f6346bdeb1ead9d17bd7cea89d9ad491f50f0479081053cc6e5742a89e64")

var/spack/repos/builtin/packages/cronie/package.py

@@ -13,7 +13,6 @@ class Cronie(AutotoolsPackage):
     homepage = "https://github.com/cronie-crond/cronie"
     url = "https://github.com/cronie-crond/cronie/archive/cronie-1.5.5.tar.gz"
 
-    version("1.6.1", sha256="1ddbc8f8d07dfe1d45998b0a0cbd9a216cd4d7bc64d1626b2bc8b3a69e4641d1")
     version("1.5.5", sha256="22c2a2b22577c0f776c1268d0e0f305c5c041e10155022a345b43b665da0ffe9")
 
     def autoreconf(self, spec, prefix):

var/spack/repos/builtin/packages/crtm-fix/package.py

@@ -18,7 +18,7 @@ class CrtmFix(Package):
         "BenjaminTJohnson", "edwardhartnett", "AlexanderRichert-NOAA", "Hang-Lei-NOAA", "climbfuji"
     )
 
-    version("2.4.0_emc", sha256="d0f1b2ae2905457f4c3731746892aaa8f6b84ee0691f6228dfbe48917df1e85e")
+    version("2.4.0_emc", sha256="88d659ae5bc4434f7fafa232ff65b4c48442d2d1a25f8fc96078094fa572ac1a")
     version("2.3.0_emc", sha256="1452af2d1d11d57ef3c57b6b861646541e7042a9b0f3c230f9a82854d7e90924")
 
     variant("big_endian", default=True, description="Install big_endian fix files")

var/spack/repos/builtin/packages/cups/package.py

@@ -16,7 +16,6 @@ class Cups(AutotoolsPackage):
     homepage = "https://www.cups.org/"
     url = "https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz"
 
-    version("2.3.3", sha256="261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee")
     version("2.2.3", sha256="66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f")
 
     depends_on("gnutls")

var/spack/repos/builtin/packages/davix/package.py

@@ -12,8 +12,6 @@ class Davix(CMakePackage):
     homepage = "https://davix.web.cern.ch/davix/docs/devel/index.html"
     url = "https://github.com/cern-fts/davix/releases/download/R_0_8_1/davix-0.8.1.tar.gz"
 
-    maintainers("gartung", "greenc-FNAL", "marcmengel", "vitodb")
-
     version("0.8.1", sha256="3f42f4eadaf560ab80984535ffa096d3e88287d631960b2193e84cf29a5fe3a6")
     version("0.8.0", sha256="2f108da0408a83fb5b9f0c68150d360ba733e4b3a0fe298d45b0d32d28ab7124")
     version("0.7.6", sha256="a2e7fdff29f7ba247a3bcdb08ab1db6d6ed745de2d3971b46526986caf360673")
@@ -35,15 +33,8 @@ class Davix(CMakePackage):
     depends_on("uuid")
     depends_on("openssl")
 
-    variant("thirdparty", default=False)
-    depends_on("gsoap", when="+thirdparty")
-
     def cmake_args(self):
-        cmake_args = [
-            self.define_from_variant("CMAKE_CXX_STANDARD", variant="cxxstd"),
-            self.define_from_variant("ENABLE_THIRD_PARTY_COPY", variant="thirdparty"),
-        ]
-
+        cmake_args = ["-DCMAKE_CXX_STANDARD={0}".format(self.spec.variants["cxxstd"].value)]
         if "darwin" in self.spec.architecture:
             cmake_args.append("-DCMAKE_MACOSX_RPATH=ON")
         return cmake_args

var/spack/repos/builtin/packages/diamond/package.py

@@ -14,7 +14,6 @@ class Diamond(CMakePackage):
     url = "https://github.com/bbuchfink/diamond/archive/v2.0.9.tar.gz"
     maintainers("snehring")
 
-    version("2.1.6", sha256="852d27c7535d53f1ce59db0625ff23ac3bf17e57f7a3b1c46c08718f77e19c54")
     version("2.0.15", sha256="cc8e1f3fd357d286cf6585b21321bd25af69aae16ae1a8f605ea603c1886ffa4")
     version("2.0.14", sha256="3eaef2b957e4ba845eac27a2ca3249aae4259ff1fe0ff5a21b094481328fdc53")
     version("2.0.11", sha256="41f3197aaafff9c42763fb7658b67f730ebc6dd3c0533c9c3d54bd3166e93f24")

var/spack/repos/builtin/packages/dlb/package.py

@@ -20,7 +20,6 @@ class Dlb(AutotoolsPackage):
     maintainers("vlopezh")
 
     version("main", branch="main")
-    version("3.3", sha256="55b87aea14f3954d8878912f3134938db235e6984fae26fdf5134148007eb722")
     version("3.2", sha256="b1c65ce3179b5275cfdf0bf921c0565a4a3ebcfdab72d7cef014957c17136c7e")
     version("3.1", sha256="d63ee89429fdb54af5510ed956f86d11561911a7860b46324f25200d32d0d333")
     version("3.0.2", sha256="75b6cf83ea24bb0862db4ed86d073f335200a0b54e8af8fee6dcf32da443b6b8")

var/spack/repos/builtin/packages/dos2unix/package.py

@@ -16,7 +16,6 @@ class Dos2unix(MakefilePackage):
 
     maintainers("cessenat")
 
-    version("7.4.4", sha256="28a841db0bd5827d645caba9d8015e3a71983dc6e398070b5287ee137ae4436e")
     version("7.4.2", sha256="6035c58df6ea2832e868b599dfa0d60ad41ca3ecc8aa27822c4b7a9789d3ae01")
     version("7.3.4", sha256="8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5")
 

var/spack/repos/builtin/packages/double-batched-fft-library/package.py

@@ -17,11 +17,10 @@ class DoubleBatchedFftLibrary(CMakePackage):
     url = "https://github.com/intel/double-batched-fft-library/archive/refs/tags/v0.3.6.tar.gz"
     git = "https://github.com/intel/double-batched-fft-library.git"
 
-    maintainers("uphoffc")
+    maintainers = ["uphoffc"]
 
     version("main", branch="main")
     version("develop", branch="develop")
-    version("0.4.0", sha256="f3518012b632c92c2a933d70a040d6b0eee2d631ab6b1881a192a8d1624f242d")
     version("0.3.6", sha256="ff163251d77d3c686563141e871c702bf4997c0302d53616add55d6cf9b02d28")
 
     variant("shared", default=True, description="Shared library")

var/spack/repos/builtin/packages/dpmjet/package.py

@@ -16,7 +16,7 @@ class Dpmjet(MakefilePackage):
     list_url = "https://github.com/DPMJET/DPMJET/tags"
     git = "https://github.com/DPMJET/DPMJET.git"
 
-    maintainers("wdconinc")
+    maintainers = ["wdconinc"]
 
     version("19.3.5", sha256="5a546ca20f86abaecda1828eb5b577aee8a532dffb2c5e7244667d5f25777909")
     version("19.3.4", sha256="646f520aa67ef6355c45cde155a5dd55f7c9d661314358a7668f6ff472f5d5f9")

var/spack/repos/builtin/packages/dust/package.py

@@ -14,7 +14,6 @@ class Dust(Package):
 
     maintainers("fangohr")
 
-    version("0.8.6", sha256="feede818e814011207c5bfeaf06dd9fc95825c59ab70942aa9b9314791c5d6b6")
     version("0.7.5", sha256="f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618")
 
     depends_on("rust")

var/spack/repos/builtin/packages/ecp-data-vis-sdk/package.py

@@ -152,7 +152,7 @@ class EcpDataVisSdk(BundlePackage, CudaPackage, ROCmPackage):
     # Fortran support with ascent is problematic on some Cray platforms so the
     # SDK is explicitly disabling it until the issues are resolved.
     dav_sdk_depends_on(
-        "ascent+mpi~fortran+python+shared+vtkh+dray~test",
+        "ascent+mpi~fortran+openmp+python+shared+vtkh+dray~test",
         when="+ascent",
         propagate=["adios2", "cuda"] + cuda_arch_variants,
     )

var/spack/repos/builtin/packages/emacs/package.py

@@ -3,7 +3,6 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-import os
 import sys
 
 from spack.package import *
@@ -98,32 +97,18 @@ def configure_args(self):
 
         return args
 
-    def run_version_check(self, bin):
-        """Runs and checks output of the installed binary."""
-        exe_path = join_path(self.prefix.bin, bin)
-        if not os.path.exists(exe_path):
-            raise SkipTest(f"{exe_path} is not installed")
+    def _test_check_versions(self):
+        """Perform version checks on installed package binaries."""
+        checks = ["ctags", "ebrowse", "emacs", "emacsclient", "etags"]
 
-        exe = which(exe_path)
-        out = exe("--version", output=str.split, error=str.split)
-        assert str(self.spec.version) in out
+        for exe in checks:
+            expected = str(self.spec.version)
+            reason = "test version of {0} is {1}".format(exe, expected)
+            self.run_test(
+                exe, ["--version"], expected, installed=True, purpose=reason, skip_missing=True
+            )
 
-    def test_ctags(self):
-        """check ctags version"""
-        self.run_version_check("ctags")
-
-    def test_ebrowse(self):
-        """check ebrowse version"""
-        self.run_version_check("ebrowse")
-
-    def test_emacs(self):
-        """check emacs version"""
-        self.run_version_check("emacs")
-
-    def test_emacsclient(self):
-        """check emacsclient version"""
-        self.run_version_check("emacsclient")
-
-    def test_etags(self):
-        """check etags version"""
-        self.run_version_check("etags")
+    def test(self):
+        """Perform smoke tests on the installed package."""
+        # Simple version check tests on known binaries
+        self._test_check_versions()

var/spack/repos/builtin/packages/entt/package.py

@@ -14,7 +14,6 @@ class Entt(CMakePackage):
     homepage = "https://entt.docsforge.com"
     url = "https://github.com/skypjack/entt/archive/v3.5.2.tar.gz"
 
-    version("3.11.1", sha256="0ac010f232d3089200c5e545bcbd6480cf68b705de6930d8ff7cdb0a29f5b47b")
     version("3.5.2", sha256="f9271293c44518386c402c9a2188627819748f66302df48af4f6d08e30661036")
 
     depends_on("cmake@3.7.0:", type="build")

var/spack/repos/builtin/packages/environment-modules/package.py

@@ -13,13 +13,12 @@ class EnvironmentModules(Package):
     """
 
     homepage = "https://cea-hpc.github.io/modules/"
-    url = "https://github.com/cea-hpc/modules/releases/download/v5.3.0/modules-5.3.0.tar.gz"
+    url = "https://github.com/cea-hpc/modules/releases/download/v5.2.0/modules-5.2.0.tar.gz"
     git = "https://github.com/cea-hpc/modules.git"
 
     maintainers("xdelaruelle")
 
     version("main", branch="main")
-    version("5.3.0", sha256="21b8daa0181044ef65097a1e3517af1f24e7c7343cc5bdaf70be11e3cb0edb51")
     version("5.2.0", sha256="48f9f10864303df628a48cab17074820a6251ad8cd7d66dd62aa7798af479254")
     version("5.1.1", sha256="1985f79e0337f63d6564b08db0238cf96a276a4184def822bb8ad37996dc8295")
     version("5.1.0", sha256="1ab1e859b9c8bca8a8d332945366567fae4cf8dd7e312a689daaff46e7ffa949")

var/spack/repos/builtin/packages/estarlight/package.py

@@ -16,7 +16,7 @@ class Estarlight(CMakePackage):
     list_url = "https://github.com/eic/estarlight/tags"
     git = "https://github.com/eic/estarlight.git"
 
-    maintainers("wdconinc")
+    maintainers = ["wdconinc"]
 
     version("master", branch="master")
     version("1.0.1", sha256="b43c1dd3663d8f325f30b17dd7cf4b49f2eb8ceeed7319c5aabebec8676279fd")

var/spack/repos/builtin/packages/f3d/package.py

@@ -12,7 +12,6 @@ class F3d(CMakePackage):
     homepage = "https://f3d-app.github.io"
     url = "https://github.com/f3d-app/f3d/archive/refs/tags/v1.1.1.tar.gz"
 
-    version("2.0.0", sha256="5b335de78a9f68903d7023d947090d4b36fa15b9e165749906a82153e0f56d05")
     version("1.1.1", sha256="68bdbe3a90f2cd553d5e090a95d3c847e2a2f06abbe225ffecd47d3d29978b0a")
 
     depends_on("vtk@9:", type="link")

var/spack/repos/builtin/packages/flux-security/package.py

@@ -1,61 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-import os
-
-import spack.util.executable
-from spack.package import *
-
-
-class FluxSecurity(AutotoolsPackage):
-    """Independent project for Flux security code and APIs."""
-
-    homepage = "https://github.com/flux-framework/flux-security"
-    url = "https://github.com/flux-framework/flux-security/releases/download/v0.8.0/flux-security-0.8.0.tar.gz"
-    git = "https://github.com/flux-framework/flux-security.git"
-    tags = ["radiuss", "e4s"]
-
-    maintainers("grondo")
-
-    version("master", branch="master")
-    version("0.8.0", sha256="9963628063b4abdff6bece03208444c8f23fbfda33c20544c48b21e9f4819ce2")
-
-    # Need autotools when building on master:
-    depends_on("autoconf", type="build", when="@master")
-    depends_on("automake", type="build", when="@master")
-    depends_on("libtool", type="build", when="@master")
-
-    depends_on("pkgconfig")
-    depends_on("libsodium@1.0.14:")
-    depends_on("jansson")
-    depends_on("libuuid")
-    depends_on("munge")
-    depends_on("libpam")
-
-    def setup(self):
-        pass
-
-    @when("@master")
-    def setup(self):
-        with working_dir(self.stage.source_path):
-            # Allow git-describe to get last tag so flux-version works:
-            git = which("git")
-            # When using spack develop, this will already be unshallow
-            try:
-                git("fetch", "--unshallow")
-                git("config", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*")
-                git("fetch", "origin")
-            except spack.util.executable.ProcessError:
-                git("fetch")
-
-    def autoreconf(self, spec, prefix):
-        self.setup()
-        if os.path.exists(self.configure_abs_path):
-            return
-        # make sure configure doesn't get confused by the staging symlink
-        with working_dir(self.configure_directory):
-            # Bootstrap with autotools
-            bash = which("bash")
-            bash("./autogen.sh")

var/spack/repos/builtin/packages/fplll/package.py

@@ -14,7 +14,6 @@ class Fplll(AutotoolsPackage):
     homepage = "https://github.com/fplll/fplll"
     url = "https://github.com/fplll/fplll/releases/download/5.4.0/fplll-5.4.0.tar.gz"
 
-    version("5.4.4", sha256="0fd9d378f04ff886d8864728baf5d90b8b0b82c1e541e92550644fb54f75691d")
     version("5.4.1", sha256="7bd887957173aa592091772c1c36f6aa606b3b2ace0d14e2c26c7463dcf2deb7")
     version("5.4.0", sha256="fe192a65a56439b098e26e3b7ee224dda7c2c73a58f36ef2cc6f9185ae8c482b")
     version("5.3.3", sha256="5e7c46c30623795feeac19cf607583b7c82b0490ceb91498f0f712789be20ccd")

var/spack/repos/builtin/packages/fullock/package.py

@@ -14,7 +14,6 @@ class Fullock(AutotoolsPackage):
     homepage = "https://antpick.ax/"
     url = "https://github.com/yahoojapan/fullock/archive/v1.0.36.tar.gz"
 
-    version("1.0.50", sha256="7222976883289376c1b88fd30ecd3ab2f055316103b97df4aa71192954072848")
     version("1.0.39", sha256="0089d4446e3102b5de39e3d18c1b7e5c9567deb77a4e60963e15b5c1b23a594d")
     version("1.0.36", sha256="68d0dc9036c2c1871653b4626a594f57663973c159f083ec68647c60ddc919f7")
     version("1.0.35", sha256="613462155271bf7b90ce745bafb47d23855e1b4813d3b6caa238efffb7c42841")

var/spack/repos/builtin/packages/g2c/package.py

@@ -20,7 +20,6 @@ class G2c(CMakePackage):
     variant("jasper", default=True)
     variant("openjpeg", default=False)
 
-    version("1.7.0", sha256="73afba9da382fed73ed8692d77fa037bb313280879cd4012a5e5697dccf55175")
     version("1.6.4", sha256="5129a772572a358296b05fbe846bd390c6a501254588c6a223623649aefacb9d")
     version("1.6.2", sha256="b5384b48e108293d7f764cdad458ac8ce436f26be330b02c69c2a75bb7eb9a2c")
 

var/spack/repos/builtin/packages/getorganelle/package.py

@@ -12,7 +12,7 @@ class Getorganelle(PythonPackage):
     homepage = "https://github.com/Kinggerm/GetOrganelle"
     url = "https://github.com/Kinggerm/GetOrganelle/archive/refs/tags/1.7.5.0.tar.gz"
 
-    maintainers("snehring")
+    maintainers = ["snehring"]
 
     version("1.7.7.0", sha256="dd351b5cd33688adfcd8bff9794ae0cc0ce01a572dac2bcf6c9d7db77b3e4883")
     version("1.7.5.0", sha256="c498196737726cb4c0158f23037bf301a069f5028ece729bb4d09c7d915df93d")

var/spack/repos/builtin/packages/go/package.py

@@ -39,25 +39,13 @@ class Go(Package):
 
     maintainers("alecbcs")
 
-    version("1.20.4", sha256="9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6")
     version("1.20.3", sha256="e447b498cde50215c4f7619e5124b0fc4e25fb5d16ea47271c47f278e7aa763a")
+    version("1.20.2", sha256="4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab")
 
-    version("1.19.9", sha256="131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744")
     version("1.19.8", sha256="1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f")
+    version("1.19.7", sha256="775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633")
 
     # Deprecated Versions
-    # https://nvd.nist.gov/vuln/detail/CVE-2023-24538
-    version(
-        "1.20.2",
-        sha256="4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab",
-        deprecated=True,
-    )
-    version(
-        "1.19.7",
-        sha256="775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633",
-        deprecated=True,
-    )
-
     # https://nvd.nist.gov/vuln/detail/CVE-2023-24532
     version(
         "1.20.1",

var/spack/repos/builtin/packages/graphviz/package.py

@@ -19,7 +19,6 @@ class Graphviz(AutotoolsPackage):
     git = "https://gitlab.com/graphviz/graphviz.git"
     url = "https://gitlab.com/graphviz/graphviz/-/archive/2.46.0/graphviz-2.46.0.tar.bz2"
 
-    version("8.0.5", sha256="c1901fe52483fad55fbf893ccd59a3dcaedd53f0d50b5aebbbf3deaba93b674d")
     version("8.0.1", sha256="19928f09f759676578b50101420b24475eb35f712ffbe8a97254f64b20fdbd03")
     version("7.1.0", sha256="7943c3fa0c55c779f595259f3b9e41c7ea6ed92f0aca0d24df917f631322dc01")
     version("2.49.0", sha256="b129555743bb9bfb7b63c55825da51763b2f1ee7c0eaa6234a42a61a3aff6cc9")

var/spack/repos/builtin/packages/gsi-ncdiag/package.py

@@ -12,7 +12,7 @@ class GsiNcdiag(CMakePackage):
     homepage = "https://github.com/NOAA-EMC/GSI-ncdiag"
     url = "https://github.com/NOAA-EMC/GSI-ncdiag/archive/refs/tags/v1.0.0.tar.gz"
 
-    maintainers("ulmononian")
+    maintainers = ["ulmononian"]
 
     version("1.0.0", sha256="7251d6139c2bc1580db5f7f019e10a4c73d188ddd52ccf21ecc9e39d50a6af51")
 

var/spack/repos/builtin/packages/gsl-lite/package.py

@@ -17,7 +17,6 @@ class GslLite(CMakePackage):
 
     maintainers("AlexanderRichert-NOAA", "climbfuji", "edwardhartnett", "Hang-Lei-NOAA")
 
-    version("0.41.0", sha256="4682d8a60260321b92555760be3b9caab60e2a71f95eddbdfb91e557ee93302a")
     version("0.40.0", commit="d6c8af99a1d95b3db36f26b4f22dc3bad89952de")
     version("0.39.0", commit="d0903fa87ff579c30f608bc363582e6563570342")
     version("0.38.1", sha256="c2fa2315fff312f3897958903ed4d4e027f73fa44235459ecb467ad7b7d62b18")

var/spack/repos/builtin/packages/harfbuzz/package.py

@@ -18,7 +18,6 @@ class Harfbuzz(MesonPackage, AutotoolsPackage):
         conditional("autotools", when="@:2.9"), conditional("meson", when="@3:"), default="meson"
     )
 
-    version("7.2.0", sha256="fc5560c807eae0efd5f95b5aa4c65800c7a8eed6642008a6b1e7e3ffff7873cc")
     version("6.0.0", sha256="1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4")
     version(
         "5.3.1",

var/spack/repos/builtin/packages/hwloc/package.py

@@ -176,7 +176,9 @@ def configure_args(self):
             args.append("--with-rocm={0}".format(self.spec["hip"].prefix))
             args.append("--with-rocm-version={0}".format(self.spec["hip"].version))
 
-        args.extend(self.enable_or_disable("netloc"))
+        if "+netloc" in self.spec:
+            args.append("--enable-netloc")
+
         args.extend(self.enable_or_disable("cairo"))
         args.extend(self.enable_or_disable("nvml"))
         args.extend(self.enable_or_disable("gl"))

var/spack/repos/builtin/packages/iso-codes/package.py

@@ -13,7 +13,6 @@ class IsoCodes(AutotoolsPackage):
     homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"
     url = "https://deb.debian.org/debian/pool/main/i/iso-codes/iso-codes_4.3.orig.tar.xz"
 
-    version("4.15.0", sha256="3d50750bf1d62d83b6085f5815ceb8392df34266a15f16bcf8d4cf7eb15d245c")
     version("4.13.0", sha256="2d4d0e5c02327f52cf7c029202da72f2074348472c26904b7104d2be3e0750ef")
     version("4.3", sha256="643eb83b2d714e8650ed7112706968d057bf5b101ba71c8ef219e20f1737b141")
 

var/spack/repos/builtin/packages/jwt-cpp/package.py

@@ -1,49 +0,0 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-from spack.package import *
-
-
-class JwtCpp(CMakePackage):
-    """A header only library for creating and validating JSON Web Tokens in C++11."""
-
-    homepage = "https://thalhammer.github.io/jwt-cpp/"
-    url = "https://github.com/Thalhammer/jwt-cpp/archive/refs/tags/v0.4.0.tar.gz"
-
-    maintainers("gartung", "greenc-FNAL", "marcmengel", "vitodb")
-
-    version("0.6.0", sha256="0227bd6e0356b211341075c7997c837f0b388c01379bd256aa525566a5553f03")
-    version("0.5.2", sha256="d3188f9611597eb1bb285169879e1d87202bf10a08e4e7734c9f2097bfd4a850")
-    version("0.5.1", sha256="d8f5ffb361824630b3b6f4aad26c730c915081071040c232ac57947d6177ef4f")
-    version("0.5.0", sha256="079a273f070dd11213e301712319a65881e51ab81535cc436d5313191df852a2")
-    version("0.4.0", sha256="f0dcc7b0e8bef8f9c3f434e7121f9941145042c9fe3055a5bdd709085a4f2be4")
-
-    # TODO: jwt-cpp>=0.6.0 supports wolfSSL for which there is currently
-    # no Spack recipe.
-    variant(
-        "ssl",
-        default="openssl",
-        values=("openssl", "libressl"),
-        multi=False,
-        when="@0.5.0:",
-        description="SSL library to use",
-    )
-
-    depends_on("openssl@1.0.2:", when="@0.4.0:0.4.99")
-    depends_on("openssl@1.0.2:", when="@0.5.0:0.5.99 ssl=openssl")
-    depends_on("openssl@1.0.1:", when="@0.6.0: ssl=openssl")
-    depends_on("libressl@3:", when="@0.5.0: ssl=libressl")
-
-    def cmake_args(self):
-        spec = self.spec
-        define = self.define
-        args = []
-        if spec.satisfies("@0.5.0:"):
-            ssl_library_dict = {"openssl": "OpenSSL", "libressl": "LibreSSL"}
-            args.append(define("JWT_SSL_LIBRARY", ssl_library_dict[spec.variants["ssl"].value]))
-            args += [define("JWT_BUILD_TESTS", False), define("JWT_BUILD_EXAMPLES", False)]
-        else:
-            args.append(define("BUILD_TESTS", False))
-        return args

var/spack/repos/builtin/packages/kokkos/package.py

@@ -207,8 +207,6 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
     variant("std", default="17", values=stds, multi=False)
     variant("pic", default=False, description="Build position independent code")
 
-    conflicts("std=11", when="@3.7:")
-
     conflicts("+cuda", when="std=17 ^cuda@:10")
     conflicts("+cuda", when="std=20 ^cuda@:12")
 

var/spack/repos/builtin/packages/krakenuniq/package.py

@@ -12,7 +12,6 @@ class Krakenuniq(Package):
     homepage = "https://genomebiology.biomedcentral.com/articles/10.1186/s13059-018-1568-0"
     url = "https://github.com/fbreitwieser/krakenuniq/archive/refs/tags/v0.7.3.tar.gz"
 
-    version("1.0.4", sha256="5e2ef21878c1c4ce92be9925e47b9ccae0ecb59a79d71cc4cbb53d057e0de9ec")
     version("0.7.3", sha256="140dccbabec00153c8231ac3c92eb8aecc0277c8947055d4d41abe949ae658c3")
     version("0.7.2", sha256="e6b4c04dbe8276c44fa9e2613cca78429439d75d59e22303094e6577ba333627")
     version("0.7.1", sha256="7f3da1efa1377f8615ad3587c4028fa462e7d802fa3f676b9c4e05d15215fad4")

var/spack/repos/builtin/packages/lcov/package.py

@@ -14,7 +14,7 @@ class Lcov(MakefilePackage):
 
     homepage = "http://ltp.sourceforge.net/coverage/lcov.php"
     url = "https://github.com/linux-test-project/lcov/releases/download/v1.14/lcov-1.14.tar.gz"
-    maintainers("KineticTheory")
+    maintainers = ["KineticTheory"]
 
     version("1.16", sha256="987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b")
     version("1.15", sha256="c1cda2fa33bec9aa2c2c73c87226cfe97de0831887176b45ee523c5e30f8053a")

var/spack/repos/builtin/packages/libconfuse/package.py

@@ -12,7 +12,6 @@ class Libconfuse(AutotoolsPackage):
     homepage = "https://github.com/martinh/libconfuse"
     url = "https://github.com/martinh/libconfuse/archive/v3.2.2.tar.gz"
 
-    version("3.3", sha256="cb90c06f2dbec971792af576d5b9a382fb3c4ca2b1deea55ea262b403f4e641e")
     version("3.2.2", sha256="2cf7e032980aff8f488efba61510dc3fb95e9a4b9183f985dea457a5651b0e2c")
     version("3.2.1", sha256="2eff8e3c300c4ed1d67fdb13f9d31a72a68e31874b4640db15334305bc40cebd")
 

var/spack/repos/builtin/packages/libfyaml/package.py

@@ -13,7 +13,6 @@ class Libfyaml(AutotoolsPackage):
     homepage = "https://github.com/pantoniou/libfyaml"
     url = "https://github.com/pantoniou/libfyaml/releases/download/v0.5.7/libfyaml-0.5.7.tar.gz"
 
-    version("0.8", sha256="dc4d4348eedca68e8e2394556d57f71410e7d61791a71cbe178302ebe5f26b99")
     version("0.7.12", sha256="485342c6920e9fdc2addfe75e5c3e0381793f18b339ab7393c1b6edf78bf8ca8")
     version("0.5.7", sha256="3221f31bb3feba97e544a82d0d5e4711ff0e4101cca63923dc5a1a001c187590")
 

var/spack/repos/builtin/packages/libluv/package.py

@@ -14,7 +14,6 @@ class Libluv(CMakePackage):
     homepage = "https://github.com/luvit/luv"
     url = "https://github.com/luvit/luv/releases/download/1.36.0-0/luv-1.36.0-0.tar.gz"
 
-    version("1.44.2-1", sha256="3eb5c7bc44f61fbc4148ea30e3221d410263e0ffa285672851fc19debf9e5c30")
     version("1.43.0-0", sha256="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2")
     version("1.42.0-1", sha256="4b6fbaa89d2420edf6070ad9e522993e132bd7eb2540ff754c2b9f1497744db2")
     version("1.42.0-0", sha256="b5228a9d0eaacd9f862b6270c732d5c90773a28ce53b6d9e32a14050e7947f36")

var/spack/repos/builtin/packages/libnsl/package.py

@@ -13,7 +13,6 @@ class Libnsl(AutotoolsPackage):
     homepage = "https://github.com/thkukuk/libnsl"
     url = "https://github.com/thkukuk/libnsl/archive/v1.3.0.tar.gz"
 
-    version("2.0.0", sha256="eb37be57c1cf650b3a8a4fc7cd66c8b3dfc06215b41956a16325a9388171bc40")
     version("1.3.0", sha256="8e88017f01dd428f50386186b0cd82ad06c9b2a47f9c5ea6b3023fc6e08a6b0f")
     version("1.2.0", sha256="a5a28ef17c4ca23a005a729257c959620b09f8c7f99d0edbfe2eb6b06bafd3f8")
     version(

var/spack/repos/builtin/packages/libvterm/package.py

@@ -13,7 +13,6 @@ class Libvterm(MakefilePackage):
     homepage = "http://www.leonerd.org.uk/code/libvterm/"
     url = "http://www.leonerd.org.uk/code/libvterm/libvterm-0.1.3.tar.gz"
 
-    version("0.3.1", sha256="25a8ad9c15485368dfd0a8a9dca1aec8fea5c27da3fa74ec518d5d3787f0c397")
     version("0.3", sha256="61eb0d6628c52bdf02900dfd4468aa86a1a7125228bab8a67328981887483358")
     version("0.2", sha256="4c5150655438cfb8c57e7bd133041140857eb04defd0e544521c0e469258e105")
     version("0.1.4", sha256="bc70349e95559c667672fc8c55b9527d9db9ada0fb80a3beda533418d782d3dd")

var/spack/repos/builtin/packages/libxcb/package.py

@@ -17,6 +17,9 @@ class Libxcb(AutotoolsPackage):
 
     version("1.14", sha256="a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34")
     version("1.13", sha256="0bb3cfd46dbd90066bf4d7de3cad73ec1024c7325a4a0cbf5f4a0d4fa91155fb")
+    version("1.12", sha256="092f147149d8a6410647a848378aaae749304d5b73e028ccb8306aa8a9e26f06")
+    version("1.11.1", sha256="660312d5e64d0a5800262488042c1707a0261fa01a759bad265b1b75dd4844dd")
+    version("1.11", sha256="4b351e1dc95eb0a1c25fa63611a6f4cf033cb63e20997c4874c80bbd1876d0b4")
 
     depends_on("libpthread-stubs")
     depends_on("libxau@0.99.2:")
@@ -24,10 +27,17 @@ class Libxcb(AutotoolsPackage):
 
     # libxcb 1.X requires xcb-proto >= 1.X
     depends_on("xcb-proto")
-    depends_on("xcb-proto@1.14:", when="@1.14")
-    depends_on("xcb-proto@1.13:", when="@1.13")
+    depends_on("xcb-proto@1.14:", when="@1.14:1.14.999")
+    depends_on("xcb-proto@1.13:", when="@1.13:1.13.999")
+    depends_on("xcb-proto@1.12:", when="@1.12:1.12.999")
+    depends_on("xcb-proto@1.11:", when="@1.11:1.11.999")
+
+    # TODO: uncomment once build deps can be resolved separately
+    # See #7646, #4145, #4063, and #2548 for details
+    # libxcb 1.13 added Python 3 support
+    # depends_on('python', type='build')
+    # depends_on('python@2:2.8', when='@:1.12', type='build')
 
-    depends_on("python", type="build")
     depends_on("pkgconfig", type="build")
     depends_on("util-macros", type="build")
 

var/spack/repos/builtin/packages/libxpm/package.py

@@ -27,6 +27,6 @@ class Libxpm(AutotoolsPackage, XorgPackage):
     depends_on("util-macros", type="build")
 
     def flag_handler(self, name, flags):
-        if name == "ldflags" and "intl" in self.spec["gettext"].libs.names:
+        if name == "ldlibs" and "intl" in self.spec["gettext"].libs.names:
             flags.append("-lintl")
         return env_flags(name, flags)

var/spack/repos/builtin/packages/lighttpd/package.py

@@ -13,7 +13,6 @@ class Lighttpd(CMakePackage):
     homepage = "https://www.lighttpd.net"
     url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.50.tar.gz"
 
-    version("1.4.69", sha256="657010184c4c470ad98944abbf0a8e2281800fa2bb1836c7a2cd4a8874e97b28")
     version("1.4.55", sha256="065259fb618774df516add13df22a52cac76a8f59e4561f143fe3ec810f4a03a")
     version("1.4.54", sha256="5151d38cb7c4c40effa13710e77ebdbef899f945b062cf32befc02d128ac424c")
     version("1.4.53", sha256="423b3951f212e3a30511eb86f4662a1848c6e857074289ff23fc310eef520266")

var/spack/repos/builtin/packages/llvm/package.py

@@ -88,6 +88,11 @@ class Llvm(CMakePackage, CudaPackage):
         description="Build the LLVM Fortran compiler frontend "
         "(experimental - parser only, needs GCC)",
     )
+    variant(
+        "omp_debug",
+        default=False,
+        description="Include debugging code in OpenMP runtime libraries",
+    )
     variant("lldb", default=True, when="+clang", description="Build the LLVM debugger")
     variant("lld", default=True, description="Build the LLVM linker")
     variant("mlir", default=False, when="@10:", description="Build with MLIR support")
@@ -102,18 +107,6 @@ class Llvm(CMakePackage, CudaPackage):
     variant(
         "libcxx", default=True, when="+clang", description="Build the LLVM C++ standard library"
     )
-    variant(
-        "libomptarget",
-        default=True,
-        when="+clang",
-        description="Build the OpenMP offloading library",
-    )
-    variant(
-        "omp_debug",
-        default=False,
-        when="+libomptarget",
-        description="Include debugging code in OpenMP runtime libraries",
-    )
     variant(
         "compiler-rt",
         when="+clang",
@@ -139,7 +132,7 @@ class Llvm(CMakePackage, CudaPackage):
     )
     variant(
         "targets",
-        default="all",
+        default="none",
         description=(
             "What targets to build. Spack's target family is always added "
             "(e.g. X86 is automatically enabled when targeting znver2)."
@@ -237,7 +230,7 @@ class Llvm(CMakePackage, CudaPackage):
     depends_on("hwloc")
     depends_on("hwloc@2.0.1:", when="@9:")
     depends_on("elf", when="+cuda")  # libomptarget
-    depends_on("libffi", when="+libomptarget")  # libomptarget
+    depends_on("libffi", when="+cuda")  # libomptarget
 
     # llvm-config --system-libs libraries.
     depends_on("zlib")
@@ -279,15 +272,6 @@ class Llvm(CMakePackage, CudaPackage):
     conflicts("%clang@:10", when="@13:+libcxx")
     conflicts("%apple-clang@:11", when="@13:+libcxx")
 
-    # libomptarget
-    conflicts("+cuda", when="@15:")  # +cuda variant is obselete since LLVM 15
-    conflicts(
-        "targets=none",
-        when="+libomptarget",
-        msg="Non-host backends needed for offloading, set targets=all",
-    )
-    conflicts("~lld", when="+libomptarget")
-
     # cuda_arch value must be specified
     conflicts("cuda_arch=none", when="+cuda", msg="A value for cuda_arch must be specified.")
 
@@ -660,11 +644,6 @@ def cmake_args(self):
             else:
                 projects.append("openmp")
 
-            if "+libomptarget" in spec:
-                cmake_args.append(define("OPENMP_ENABLE_LIBOMPTARGET", True))
-            else:
-                cmake_args.append(define("OPENMP_ENABLE_LIBOMPTARGET", False))
-
             if "@8" in spec:
                 cmake_args.append(from_variant("CLANG_ANALYZER_ENABLE_Z3_SOLVER", "z3"))
             elif "@9:" in spec:

var/spack/repos/builtin/packages/maker/package.py

@@ -34,7 +34,6 @@ class Maker(Package):
     homepage = "https://www.yandell-lab.org/software/maker.html"
     manual_download = True
 
-    version("3.01.04", sha256="87be5b0fad92d7d7b359f233877830e8a353a80277c3c88aa89f359899fa8bfb")
     version("3.01.03", sha256="d3979af9710d61754a3b53f6682d0e2052c6c3f36be6f2df2286d2587406f07d")
     version("2.31.10", sha256="d3979af9710d61754a3b53f6682d0e2052c6c3f36be6f2df2286d2587406f07d")
 

var/spack/repos/builtin/packages/micromamba/package.py

@@ -23,14 +23,17 @@ class Micromamba(CMakePackage):
 
     maintainers("charmoniumQ")
 
-    version("1.4.2", sha256="dce034908d02d991c5e9aadeb9d01f139d027ba199aaeb1d47d543e3f24895d1")
     version("1.1.0", sha256="e2392cd90221234ae8ea92b37f40829fbe36d80278056269aa1994a5efe7f530")
 
     variant(
         "linkage",
         default="dynamic",
         description=f"See MICROMAMBA_LINKAGE in {linkage_url}.",
-        values=("dynamic", conditional("static", when="@1.1.0")),
+        values=(
+            "dynamic",
+            "static",
+            # "full_static",
+        ),
         multi=False,
     )
 
@@ -57,9 +60,6 @@ class Micromamba(CMakePackage):
         # https://github.com/mamba-org/mamba/blob/micromamba-1.0.0/micromamba/src/common_options.hpp#L12
         depends_on("cli11@2.2:", type="link")
 
-        depends_on("zstd build_system=cmake", type="link", when="@1.4.0:")
-
-        # 1.4.2 made the static build the old "full_static" build and it needs some work.
     with when("linkage=static"):
         # When linkage is static, BUILD_STATIC=ON
         # and then

var/spack/repos/builtin/packages/mrchem/package.py

@@ -16,7 +16,6 @@ class Mrchem(CMakePackage):
 
     maintainers("robertodr", "stigrj", "ilfreddy")
 
-    version("1.1.2", sha256="b4e74ad5ee89fc5e8a7329474cf0fa93155423f93a1f95c8c2888f7c53e353ea")
     version("1.0.0", sha256="9cdda4d30b2baabb26400742f78ef8f3fc50a54f5218c8b6071b0cbfbed746c3")
     version("0.2.2", sha256="7519cc104c7df51eea8902c225aac6ecce2ac4ff30765145e502342d5bf3d96b")
     version("0.2.1", sha256="c1d0da5fefae356d9746f8ee761a94f6f6cd8b735a8309a4048ad6b8943ad242")

var/spack/repos/builtin/packages/mutationpp/package.py

@@ -18,7 +18,6 @@ class Mutationpp(CMakePackage):
     homepage = "https://github.com/mutationpp/Mutationpp"
     url = "https://github.com/mutationpp/Mutationpp/archive/v0.3.1.tar.gz"
 
-    version("1.0.5", sha256="319eca4e82a2469946344195373eabf28caaf6a39ddf3142b2337f47aa0835a8")
     version("1.0.0", sha256="928df99accd1a02706a57246edeef8ebbf3bd91bb40492258ee18b810a7e0194")
     version("0.3.1", sha256="a6da2816e145ac9fcfbd8920595b7f65ce7bc8df0bec572b32647720758cbe69")
 

var/spack/repos/builtin/packages/netcdf95/package.py

@@ -13,7 +13,7 @@ class Netcdf95(CMakePackage):
     homepage = "https://lguez.github.io/NetCDF95/"
     git = "https://github.com/lguez/NetCDF95.git"
 
-    maintainers("RemiLacroix-IDRIS")
+    maintainers = ["RemiLacroix-IDRIS"]
 
     version("0.3", tag="v0.3", submodules=True)
 

var/spack/repos/builtin/packages/openspeedshop-utils/package.py

@@ -31,7 +31,7 @@ class OpenspeedshopUtils(CMakePackage):
     homepage = "http://www.openspeedshop.org"
     git = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
-    maintainers("jgalarowicz")
+    maintainers = ["jgalarowicz"]
 
     version("develop", branch="master")
     version("2.4.2.1", branch="2.4.2.1")

var/spack/repos/builtin/packages/openspeedshop/package.py

@@ -26,7 +26,7 @@ class Openspeedshop(CMakePackage):
     homepage = "http://www.openspeedshop.org"
     git = "https://github.com/OpenSpeedShop/openspeedshop.git"
 
-    maintainers("jgalarowicz")
+    maintainers = ["jgalarowicz"]
 
     version("develop", branch="master")
     version("2.4.2.1", branch="2.4.2.1")