black: break up long strings that black cannot fix

40 files changed, 432 insertions, 155 deletions

diff --git a/lib/spack/spack/bootstrap.py b/lib/spack/spack/bootstrap.py
index 3313c475a2..8cd820f6c0 100644
--- a/lib/spack/spack/bootstrap.py
+++ b/lib/spack/spack/bootstrap.py
@@ -545,7 +545,10 @@ def ensure_module_importable_or_raise(module, abstract_spec=None):
             if b.try_import(module, abstract_spec):
                 return
 
-    assert h, 'expected at least one exception to have been raised at this point: while bootstrapping {0}'.format(module)  # noqa: E501
+    assert h, (
+        "expected at least one exception to have been raised at this point: "
+        "while bootstrapping {0}".format(module)
+    )
     msg = 'cannot bootstrap the "{0}" Python module '.format(module)
     if abstract_spec:
         msg += 'from spec "{0}" '.format(abstract_spec)
@@ -599,7 +602,10 @@ def ensure_executables_in_path_or_raise(executables, abstract_spec):
                 cmd.add_default_envmod(env_mods)
                 return cmd
 
-    assert h, 'expected at least one exception to have been raised at this point: while bootstrapping {0}'.format(executables_str)  # noqa: E501
+    assert h, (
+        "expected at least one exception to have been raised at this point: "
+        "while bootstrapping {0}".format(executables_str)
+    )
     msg = 'cannot bootstrap any of the {0} executables '.format(executables_str)
     if abstract_spec:
         msg += 'from spec "{0}" '.format(abstract_spec)
diff --git a/lib/spack/spack/cmd/modules/__init__.py b/lib/spack/spack/cmd/modules/__init__.py
index f2fd63aaa0..2ccbf4b2cf 100644
--- a/lib/spack/spack/cmd/modules/__init__.py
+++ b/lib/spack/spack/cmd/modules/__init__.py
@@ -377,9 +377,15 @@ def modules_cmd(parser, args, module_type, callbacks=callbacks):
             spec_fmt += '{compiler_flags}{variants}{arch=architecture}'
             msg += '\t' + s.cformat(spec_fmt) + '\n'
         tty.error(msg.format(query=args.constraint))
-        tty.die('In this context exactly **one** match is needed: please specify your constraints better.')  # NOQA: ignore=E501
+        tty.die(
+            "In this context exactly **one** match is needed: "
+            "please specify your constraints better."
+        )
 
     except NoSpecMatches:
         msg = "the constraint '{query}' matches no package."
         tty.error(msg.format(query=args.constraint))
-        tty.die('In this context exactly **one** match is needed: please specify your constraints better.')  # NOQA: ignore=E501
+        tty.die(
+            "In this context exactly **one** match is needed: "
+            "please specify your constraints better."
+        )
diff --git a/lib/spack/spack/cmd/style.py b/lib/spack/spack/cmd/style.py
index 252e9f7b1c..3d24228a54 100644
--- a/lib/spack/spack/cmd/style.py
+++ b/lib/spack/spack/cmd/style.py
@@ -384,7 +384,7 @@ def run_black(black_cmd, file_list, args):
         output = "\n".join(
             line
             for line in output.split("\n")
-            if not "DEPRECATION: Python 2 support will be removed" in line
+            if "DEPRECATION: Python 2 support will be removed" not in line
         )
 
         rewrite_and_print_output(output, args, pat, replacement)
diff --git a/lib/spack/spack/test/cmd/spec.py b/lib/spack/spack/test/cmd/spec.py
index e406fabe26..1dfe20c780 100644
--- a/lib/spack/spack/test/cmd/spec.py
+++ b/lib/spack/spack/test/cmd/spec.py
@@ -101,7 +101,10 @@ def test_spec_parse_unquoted_flags_report():
     with pytest.raises(spack.error.SpackError) as cm:
         spec('gcc cflags=-Os -pipe')
     cm = str(cm.value)
-    assert cm.startswith('trying to set variant "pipe" in package "gcc", but the package has no such variant [happened during concretization of gcc cflags="-Os" ~pipe]')  # noqa: E501
+    assert cm.startswith(
+        'trying to set variant "pipe" in package "gcc", but the package has no such '
+        'variant [happened during concretization of gcc cflags="-Os" ~pipe]'
+    )
     assert cm.endswith('(1) cflags=-Os -pipe => cflags="-Os -pipe"')
 
 
diff --git a/lib/spack/spack/test/link_paths.py b/lib/spack/spack/test/link_paths.py
index cafb646322..4e08a26fdf 100644
--- a/lib/spack/spack/test/link_paths.py
+++ b/lib/spack/spack/test/link_paths.py
@@ -11,10 +11,14 @@ import pytest
 import spack.paths
 from spack.compiler import _parse_non_system_link_dirs
 
-is_windows = sys.platform == 'win32'
+is_windows = sys.platform == "win32"
+drive = ""
 if is_windows:
-    drive_m = re.search(r'[A-Za-z]:', spack.paths.test_path)
-    drive = drive_m.group() if drive_m else None
+    match = re.search(r"[A-Za-z]:", spack.paths.test_path)
+    if match:
+        drive = match.group()
+root = drive + os.sep
+
 #: directory with sample compiler data
 datadir = os.path.join(spack.paths.test_path, 'data',
                        'compiler_verbose_output')
@@ -45,25 +49,35 @@ def check_link_paths(filename, paths):
 
 
 def test_icc16_link_paths():
-    if is_windows:
-        check_link_paths('icc-16.0.3.txt', [
-            drive + r'\usr\tce\packages\intel\intel-16.0.3\compilers_and_libraries_2016.3.210\linux\compiler\lib\intel64_lin',  # noqa
-            drive + r'\usr\tce\packages\gcc\gcc-4.9.3\lib64\gcc\x86_64-unknown-linux-gnu\4.9.3',  # noqa
-            drive + r'\usr\tce\packages\gcc\gcc-4.9.3\lib64'])
-    else:
-        check_link_paths('icc-16.0.3.txt', [
-            '/usr/tce/packages/intel/intel-16.0.3/compilers_and_libraries_2016.3.210/linux/compiler/lib/intel64_lin',  # noqa
-            '/usr/tce/packages/gcc/gcc-4.9.3/lib64/gcc/x86_64-unknown-linux-gnu/4.9.3',  # noqa
-            '/usr/tce/packages/gcc/gcc-4.9.3/lib64'])
+    prefix = os.path.join(root, "usr", "tce", "packages")
+    check_link_paths(
+        'icc-16.0.3.txt', [
+            os.path.join(
+                prefix,
+                "intel",
+                "intel-16.0.3",
+                "compilers_and_libraries_2016.3.210",
+                "linux",
+                "compiler",
+                "lib",
+                "intel64_lin",
+            ),
+            os.path.join(
+                prefix, "gcc", "gcc-4.9.3", "lib64", "gcc", "x86_64-unknown-linux-gnu", "4.9.3"
+            ),
+            os.path.join(prefix, "gcc", "gcc-4.9.3", "lib64"),
+        ]
+    )
 
 
 def test_pgi_link_paths():
-    if is_windows:
-        check_link_paths('pgcc-16.3.txt', [
-            drive + r'\usr\tce\packages\pgi\pgi-16.3\linux86-64\16.3\lib'])
-    else:
-        check_link_paths('pgcc-16.3.txt', [
-            '/usr/tce/packages/pgi/pgi-16.3/linux86-64/16.3/lib'])
+    check_link_paths(
+        'pgcc-16.3.txt', [
+            os.path.join(
+                root, "usr", "tce", "packages", "pgi", "pgi-16.3", "linux86-64", "16.3", "lib"
+            )
+        ]
+    )
 
 
 def test_gcc7_link_paths():
@@ -75,65 +89,68 @@ def test_clang4_link_paths():
 
 
 def test_xl_link_paths():
-    if is_windows:
-        check_link_paths('xl-13.1.5.txt', [
-            drive + r'\opt\ibm\xlsmp\4.1.5\lib',
-            drive + r'\opt\ibm\xlmass\8.1.5\lib',
-            drive + r'\opt\ibm\xlC\13.1.5\lib'])
-    else:
-        check_link_paths('xl-13.1.5.txt', [
-            '/opt/ibm/xlsmp/4.1.5/lib',
-            '/opt/ibm/xlmass/8.1.5/lib',
-            '/opt/ibm/xlC/13.1.5/lib'])
+    check_link_paths(
+        'xl-13.1.5.txt', [
+            os.path.join(root, "opt", "ibm", "xlsmp", "4.1.5", "lib"),
+            os.path.join(root, "opt", "ibm", "xlmass", "8.1.5", "lib"),
+            os.path.join(root, "opt", "ibm", "xlC", "13.1.5", "lib"),
+        ]
+    )
 
 
 def test_cce_link_paths():
-    if is_windows:
-        check_link_paths('cce-8.6.5.txt', [
-            drive + r'\opt\gcc\6.1.0\snos\lib64',
-            drive + r'\opt\cray\dmapp\default\lib64',
-            drive + r'\opt\cray\pe\mpt\7.7.0\gni\mpich-cray\8.6\lib',
-            drive + r'\opt\cray\pe\libsci\17.12.1\CRAY\8.6\x86_64\lib',
-            drive + r'\opt\cray\rca\2.2.16-6.0.5.0_15.34__g5e09e6d.ari\lib64',
-            drive + r'\opt\cray\pe\pmi\5.0.13\lib64',
-            drive + r'\opt\cray\xpmem\2.2.4-6.0.5.0_4.8__g35d5e73.ari\lib64',
-            drive + r'\opt\cray\dmapp\7.1.1-6.0.5.0_49.8__g1125556.ari\lib64',
-            drive + r'\opt\cray\ugni\6.0.14-6.0.5.0_16.9__g19583bb.ari\lib64',
-            drive + r'\opt\cray\udreg\2.3.2-6.0.5.0_13.12__ga14955a.ari\lib64',
-            drive + r'\opt\cray\alps\6.5.28-6.0.5.0_18.6__g13a91b6.ari\lib64',
-            drive + r'\opt\cray\pe\atp\2.1.1\libApp',
-            drive + r'\opt\cray\pe\cce\8.6.5\cce\x86_64\lib',
-            drive + r'\opt\cray\wlm_detect\1.3.2-6.0.5.0_3.1__g388ccd5.ari\lib64',
-            drive + r'\opt\gcc\6.1.0\snos\lib\gcc\x86_64-suse-linux\6.1.0',
-            drive +
-            r'\opt\cray\pe\cce\8.6.5\binutils\x86_64\x86_64-unknown-linux-gnu\lib'])
-    else:
-        check_link_paths('cce-8.6.5.txt', [
-            '/opt/gcc/6.1.0/snos/lib64',
-            '/opt/cray/dmapp/default/lib64',
-            '/opt/cray/pe/mpt/7.7.0/gni/mpich-cray/8.6/lib',
-            '/opt/cray/pe/libsci/17.12.1/CRAY/8.6/x86_64/lib',
-            '/opt/cray/rca/2.2.16-6.0.5.0_15.34__g5e09e6d.ari/lib64',
-            '/opt/cray/pe/pmi/5.0.13/lib64',
-            '/opt/cray/xpmem/2.2.4-6.0.5.0_4.8__g35d5e73.ari/lib64',
-            '/opt/cray/dmapp/7.1.1-6.0.5.0_49.8__g1125556.ari/lib64',
-            '/opt/cray/ugni/6.0.14-6.0.5.0_16.9__g19583bb.ari/lib64',
-            '/opt/cray/udreg/2.3.2-6.0.5.0_13.12__ga14955a.ari/lib64',
-            '/opt/cray/alps/6.5.28-6.0.5.0_18.6__g13a91b6.ari/lib64',
-            '/opt/cray/pe/atp/2.1.1/libApp',
-            '/opt/cray/pe/cce/8.6.5/cce/x86_64/lib',
-            '/opt/cray/wlm_detect/1.3.2-6.0.5.0_3.1__g388ccd5.ari/lib64',
-            '/opt/gcc/6.1.0/snos/lib/gcc/x86_64-suse-linux/6.1.0',
-            '/opt/cray/pe/cce/8.6.5/binutils/x86_64/x86_64-unknown-linux-gnu/lib'])
+    gcc = os.path.join(root, "opt", "gcc")
+    cray = os.path.join(root, "opt", "cray")
+    check_link_paths(
+        'cce-8.6.5.txt', [
+            os.path.join(gcc, "6.1.0", "snos", "lib64"),
+            os.path.join(cray, "dmapp", "default", "lib64"),
+            os.path.join(cray, "pe", "mpt", "7.7.0", "gni", "mpich-cray", "8.6", "lib"),
+            os.path.join(cray, "pe", "libsci", "17.12.1", "CRAY", "8.6", "x86_64", "lib"),
+            os.path.join(cray, "rca", "2.2.16-6.0.5.0_15.34__g5e09e6d.ari", "lib64"),
+            os.path.join(cray, "pe", "pmi", "5.0.13", "lib64"),
+            os.path.join(cray, "xpmem", "2.2.4-6.0.5.0_4.8__g35d5e73.ari", "lib64"),
+            os.path.join(cray, "dmapp", "7.1.1-6.0.5.0_49.8__g1125556.ari", "lib64"),
+            os.path.join(cray, "ugni", "6.0.14-6.0.5.0_16.9__g19583bb.ari", "lib64"),
+            os.path.join(cray, "udreg", "2.3.2-6.0.5.0_13.12__ga14955a.ari", "lib64"),
+            os.path.join(cray, "alps", "6.5.28-6.0.5.0_18.6__g13a91b6.ari", "lib64"),
+            os.path.join(cray, "pe", "atp", "2.1.1", "libApp"),
+            os.path.join(cray, "pe", "cce", "8.6.5", "cce", "x86_64", "lib"),
+            os.path.join(cray, "wlm_detect", "1.3.2-6.0.5.0_3.1__g388ccd5.ari", "lib64"),
+            os.path.join(gcc, "6.1.0", "snos", "lib", "gcc", "x86_64-suse-linux", "6.1.0"),
+            os.path.join(
+                cray,
+                "pe",
+                "cce",
+                "8.6.5",
+                "binutils",
+                "x86_64",
+                "x86_64-unknown-linux-gnu",
+                "lib"
+            ),
+        ]
+    )
 
 
 def test_clang_apple_ld_link_paths():
-    if is_windows:
-        check_link_paths('clang-9.0.0-apple-ld.txt', [
-            drive + r'\Applications\Xcode.app\Contents\Developer\Platforms\MacOSX.platform\Developer\SDKs\MacOSX10.13.sdk\usr\lib'])  # noqa
-    else:
-        check_link_paths('clang-9.0.0-apple-ld.txt', [
-            '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/lib'])  # noqa
+    check_link_paths(
+        'clang-9.0.0-apple-ld.txt', [
+            os.path.join(
+                root,
+                "Applications",
+                "Xcode.app",
+                "Contents",
+                "Developer",
+                "Platforms",
+                "MacOSX.platform",
+                "Developer",
+                "SDKs",
+                "MacOSX10.13.sdk",
+                "usr",
+                "lib",
+            )
+        ]
+    )
 
 
 def test_nag_mixed_gcc_gnu_ld_link_paths():
@@ -141,16 +158,24 @@ def test_nag_mixed_gcc_gnu_ld_link_paths():
     # is used for the rpath detection. The reference compiler output is a
     # result of
     # '/path/to/gcc/bin/g++ -Wl,-v ./main.c'.
-    if is_windows:
-        check_link_paths('collect2-6.3.0-gnu-ld.txt', [
-            drive + r'\scratch\local1\spack\opt\spack\gcc-6.3.0-haswell\gcc-6.5.0-4sdjgrs\lib\gcc\x86_64-pc-linux-gnu\6.5.0',  # noqa
-            drive + r'\scratch\local1\spack\opt\spack\gcc-6.3.0-haswell\gcc-6.5.0-4sdjgrs\lib64',  # noqa
-            drive + r'\scratch\local1\spack\opt\spack\gcc-6.3.0-haswell\gcc-6.5.0-4sdjgrs\lib'])  # noqa
-    else:
-        check_link_paths('collect2-6.3.0-gnu-ld.txt', [
-            '/scratch/local1/spack/opt/spack/gcc-6.3.0-haswell/gcc-6.5.0-4sdjgrs/lib/gcc/x86_64-pc-linux-gnu/6.5.0',  # noqa
-            '/scratch/local1/spack/opt/spack/gcc-6.3.0-haswell/gcc-6.5.0-4sdjgrs/lib64',  # noqa
-            '/scratch/local1/spack/opt/spack/gcc-6.3.0-haswell/gcc-6.5.0-4sdjgrs/lib'])  # noqa
+    prefix = os.path.join(
+        root,
+        "scratch",
+        "local1",
+        "spack",
+        "opt",
+        "spack",
+        "gcc-6.3.0-haswell",
+        "gcc-6.5.0-4sdjgrs",
+    )
+
+    check_link_paths(
+        'collect2-6.3.0-gnu-ld.txt', [
+            os.path.join(prefix, "lib", "gcc", "x86_64-pc-linux-gnu", "6.5.0"),
+            os.path.join(prefix, "lib64"),
+            os.path.join(prefix, "lib"),
+        ]
+    )
 
 
 def test_nag_link_paths():
@@ -158,25 +183,35 @@ def test_nag_link_paths():
     # and therefore 'fc' is used for the rpath detection). The reference
     # compiler output is a result of
     # 'nagfor -Wc=/path/to/gcc/bin/gcc -Wl,-v ./main.c'.
-    if is_windows:
-        check_link_paths('nag-6.2-gcc-6.5.0.txt', [
-            drive + r'\scratch\local1\spack\opt\spack\gcc-6.3.0-haswell\gcc-6.5.0-4sdjgrs\lib\gcc\x86_64-pc-linux-gnu\6.5.0',  # noqa
-            drive + r'\scratch\local1\spack\opt\spack\gcc-6.3.0-haswell\gcc-6.5.0-4sdjgrs\lib64',  # noqa
-            drive + r'\scratch\local1\spack\opt\spack\gcc-6.3.0-haswell\gcc-6.5.0-4sdjgrs\lib'])  # noqa
-    else:
-        check_link_paths('nag-6.2-gcc-6.5.0.txt', [
-            '/scratch/local1/spack/opt/spack/gcc-6.3.0-haswell/gcc-6.5.0-4sdjgrs/lib/gcc/x86_64-pc-linux-gnu/6.5.0',  # noqa
-            '/scratch/local1/spack/opt/spack/gcc-6.3.0-haswell/gcc-6.5.0-4sdjgrs/lib64',  # noqa
-            '/scratch/local1/spack/opt/spack/gcc-6.3.0-haswell/gcc-6.5.0-4sdjgrs/lib'])  # noqa
+    prefix = os.path.join(
+        root,
+        "scratch",
+        "local1",
+        "spack",
+        "opt",
+        "spack",
+        "gcc-6.3.0-haswell",
+        "gcc-6.5.0-4sdjgrs",
+    )
+
+    check_link_paths(
+        'nag-6.2-gcc-6.5.0.txt', [
+            os.path.join(prefix, "lib", "gcc", "x86_64-pc-linux-gnu", "6.5.0"),
+            os.path.join(prefix, "lib64"),
+            os.path.join(prefix, "lib"),
+        ]
+    )
 
 
 def test_obscure_parsing_rules():
+    paths = [
+        os.path.join(root, "first", "path"),
+        os.path.join(root, "second", "path"),
+        os.path.join(root, "third", "path"),
+    ]
+
+    # TODO: add a comment explaining why this happens
     if is_windows:
-        check_link_paths('obscure-parsing-rules.txt', [
-            drive + r'\first\path',
-            drive + r'\third\path'])
-    else:
-        check_link_paths('obscure-parsing-rules.txt', [
-            '/first/path',
-            '/second/path',
-            '/third/path'])
+        paths.remove(os.path.join(root, "second", "path"))
+
+    check_link_paths('obscure-parsing-rules.txt', paths)
diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py
index 08d67cfb80..6175c5ad0f 100644
--- a/lib/spack/spack/test/url_parse.py
+++ b/lib/spack/spack/test/url_parse.py
@@ -77,7 +77,10 @@ from spack.version import Version
     ('haxe-2.08-osx', 'haxe-2.08'),
     # PyPI - wheel
     ('entrypoints-0.2.2-py2.py3-none-any.whl', 'entrypoints-0.2.2'),
-    ('numpy-1.12.0-cp27-cp27m-macosx_10_6_intel.macosx_10_9_intel.macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl', 'numpy-1.12.0'),  # noqa
+    (
+        'numpy-1.12.0-cp27-cp27m-macosx_10_6_intel.macosx_10_9_intel.'
+        'macosx_10_9_x86_64.macosx_10_10_intel.macosx_10_10_x86_64.whl', 'numpy-1.12.0'
+    ),
     # PyPI - exe
     ('PyYAML-3.12.win-amd64-py3.5.exe', 'PyYAML-3.12'),
     # Combinations of multiple patterns - bin, release
diff --git a/var/spack/repos/builtin/packages/albany/package.py b/var/spack/repos/builtin/packages/albany/package.py
index d7e99dd83e..7706e404dc 100644
--- a/var/spack/repos/builtin/packages/albany/package.py
+++ b/var/spack/repos/builtin/packages/albany/package.py
@@ -54,7 +54,12 @@ class Albany(CMakePackage):
 
     # Add dependencies
     depends_on('mpi')
-    depends_on('trilinos~superlu-dist+isorropia+tempus+rythmos+teko+intrepid+intrepid2+minitensor+phalanx+nox+piro+rol+shards+stk+superlu@master')
+    depends_on(
+        'trilinos'
+        '~superlu-dist+isorropia+tempus+rythmos+teko+intrepid+intrepid2'
+        '+minitensor+phalanx+nox+piro+rol+shards+stk+superlu'
+        '@master'
+    )
 
     def cmake_args(self):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/alps/package.py b/var/spack/repos/builtin/packages/alps/package.py
index ab1e90cd3d..58cc24cead 100644
--- a/var/spack/repos/builtin/packages/alps/package.py
+++ b/var/spack/repos/builtin/packages/alps/package.py
@@ -5,6 +5,10 @@
 
 from spack.package import *
 
+# Refs for building from source and recipes
+# https://alps.comp-phys.org/mediawiki/index.php/Building_ALPS_from_source
+# https://github.com/easybuilders/easybuild-easyconfigs/tree/master/easybuild/easyconfigs/a/ALPS
+# https://github.com/conda-forge/alps-feedstock/tree/master/recipe
 
 class Alps(CMakePackage):
     """Algorithms for Physics Simulations
@@ -17,13 +21,12 @@ class Alps(CMakePackage):
 
     version('2.3.0', sha256='e64208d1e5acdd6f569277413c4867e1fa366cf4a224570eacbf1e9939fca2d2')
 
-    # Refs for building from source and recipes
-    # https://alps.comp-phys.org/mediawiki/index.php/Building_ALPS_from_source
-    # https://github.com/easybuilders/easybuild-easyconfigs/tree/master/easybuild/easyconfigs/a/ALPS
-    # https://github.com/conda-forge/alps-feedstock/tree/master/recipe
-
     # Package failed to build with boost version >= 1.64
-    depends_on('boost@:1.63.0 +chrono +date_time +filesystem +iostreams +mpi +numpy +program_options +python +regex +serialization +system +test +thread +timer')
+    depends_on(
+        'boost@:1.63.0'
+        '+chrono +date_time +filesystem +iostreams +mpi +numpy +program_options'
+        '+python +regex +serialization +system +test +thread +timer'
+    )
     depends_on('fftw')
     depends_on('hdf5 ~mpi+hl')
     depends_on('lapack')
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py
index e03fc257de..cc4279c9b0 100644
--- a/var/spack/repos/builtin/packages/bazel/package.py
+++ b/var/spack/repos/builtin/packages/bazel/package.py
@@ -118,7 +118,12 @@ class Bazel(Package):
     version('0.1.4',  sha256='f3c395f5cd78cfef96f4008fe842f327bc8b03b77f46999387bc0ad223b5d970')
     version('0.1.1',  sha256='c6ae19610b936a0aa940b44a3626d6e660fc457a8187d295cdf0b21169453d20')
 
-    variant('nodepfail', default=True, description='Disable failing dependency checks due to injected absolute paths - required for most builds using bazel with spack')
+    variant(
+        'nodepfail',
+        default=True,
+        description='Disable failing dependency checks due to injected absolute paths - '
+        'required for most builds using bazel with spack'
+    )
 
     depends_on('java', type=('build', 'run'))
     depends_on('java@11', when='@5.3:', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/camellia/package.py b/var/spack/repos/builtin/packages/camellia/package.py
index 24eb3bc404..e96351039b 100644
--- a/var/spack/repos/builtin/packages/camellia/package.py
+++ b/var/spack/repos/builtin/packages/camellia/package.py
@@ -20,7 +20,12 @@ class Camellia(CMakePackage):
 
     variant('moab', default=True, description='Compile with MOAB to include support for reading standard mesh formats')
 
-    depends_on('trilinos+amesos+amesos2+belos+epetra+epetraext+exodus+ifpack+ifpack2+intrepid+intrepid2+kokkos+ml+muelu+sacado+shards+tpetra+zoltan+mumps+superlu-dist+hdf5+mpi@master,12.12.1:')
+    depends_on(
+        'trilinos'
+        '+amesos+amesos2+belos+epetra+epetraext+exodus+ifpack+ifpack2+intrepid+intrepid2'
+        '+kokkos+ml+muelu+sacado+shards+tpetra+zoltan+mumps+superlu-dist+hdf5+mpi'
+        '@master,12.12.1:'
+    )
     depends_on('moab@:4', when='+moab')
 
     # Cameilla needs hdf5 but the description "hdf5@:1.8" is
diff --git a/var/spack/repos/builtin/packages/damaris/package.py b/var/spack/repos/builtin/packages/damaris/package.py
index 813b2d8289..7e8901a887 100644
--- a/var/spack/repos/builtin/packages/damaris/package.py
+++ b/var/spack/repos/builtin/packages/damaris/package.py
@@ -29,11 +29,21 @@ class Damaris(CMakePackage):
     variant('visit',    default=False, description='Enables the VisIt visualization plugin')
     variant('examples', default=False, description='Enables compilation and installation of the examples code')
     variant('docs',     default=False, description='Enables the building of dOxygen documentation')
-    variant('python',   default=False, description='Enables building of Python enabled Damaris library - boost::python boost::numpy needed')
+    variant(
+        'python',
+        default=False,
+        description='Enables building of Python enabled Damaris library - '
+        'boost::python boost::numpy needed'
+    )
 
     depends_on('mpi')
     depends_on('cmake@3.18.0:', type=('build'))
-    depends_on('boost +exception+locale+system+serialization+chrono+atomic+container+regex+thread+log+filesystem+date_time @1.67:')
+    depends_on(
+        'boost'
+        '+exception+locale+system+serialization+chrono+atomic'
+        '+container+regex+thread+log+filesystem+date_time'
+        '@1.67:'
+    )
     depends_on('xsd')
     depends_on('xerces-c')
     depends_on('hdf5@1.8.20:', when='+hdf5')
diff --git a/var/spack/repos/builtin/packages/denovogear/package.py b/var/spack/repos/builtin/packages/denovogear/package.py
index bb77962cbd..b5356d9e0a 100644
--- a/var/spack/repos/builtin/packages/denovogear/package.py
+++ b/var/spack/repos/builtin/packages/denovogear/package.py
@@ -19,7 +19,11 @@ class Denovogear(CMakePackage):
     version('1.1.0', sha256='f818f80cd67183294c8aae312cad8311e6a9abede1f687567bb079d29f79c005')
 
     depends_on('cmake@3.1:', type=('build'))
-    depends_on('boost@1.47:1.60 +exception+filesystem+system+serialization+graph+iostreams+regex+math+container', type=('build'))
+    depends_on(
+        'boost@1.47:1.60'
+        '+exception+filesystem+system+serialization+graph+iostreams+regex+math+container',
+        type='build',
+    )
     depends_on('htslib@1.2:', type=('build'))
     depends_on('eigen', type=('build'))
     depends_on('zlib', type=('link'))
diff --git a/var/spack/repos/builtin/packages/erne/package.py b/var/spack/repos/builtin/packages/erne/package.py
index 762df38693..6a5e6be8ea 100644
--- a/var/spack/repos/builtin/packages/erne/package.py
+++ b/var/spack/repos/builtin/packages/erne/package.py
@@ -17,7 +17,12 @@ class Erne(AutotoolsPackage):
     variant('mpi', default=False,
             description='Build with OpenMPI support')
 
-    depends_on('boost@1.40.0: +exception+filesystem+system+chrono+serialization+random+atomic+iostreams+regex+thread+container', type=('build', 'link', 'run'))
+    depends_on(
+        'boost@1.40.0:'
+        '+exception+filesystem+system+chrono+serialization+random'
+        '+atomic+iostreams+regex+thread+container',
+        type=('build', 'link', 'run')
+    )
     depends_on('openmpi', type=('build', 'run'), when='+mpi')
 
     def configure_args(self):
diff --git a/var/spack/repos/builtin/packages/express/package.py b/var/spack/repos/builtin/packages/express/package.py
index 76d076a439..dcc83672d0 100644
--- a/var/spack/repos/builtin/packages/express/package.py
+++ b/var/spack/repos/builtin/packages/express/package.py
@@ -22,7 +22,11 @@ class Express(CMakePackage):
     version('1.5.2', sha256='25a63cca3dac6bd0daf04d2f0b2275e47d2190c90522bd231b1d7a875a59a52e')
     version('1.5.1', sha256='fa3522de9cc25f1ede22fa196928912a6da2a2038681911115ec3e4da3d61293')
 
-    depends_on('boost+date_time+exception+filesystem+system+chrono+atomic+container+math+thread+program_options')
+    depends_on(
+        'boost'
+        '+date_time+exception+filesystem+system+chrono'
+        '+atomic+container+math+thread+program_options'
+    )
     depends_on('bamtools')
     depends_on('zlib')
 
diff --git a/var/spack/repos/builtin/packages/faodel/package.py b/var/spack/repos/builtin/packages/faodel/package.py
index 8cf5420da8..1d2d04e717 100644
--- a/var/spack/repos/builtin/packages/faodel/package.py
+++ b/var/spack/repos/builtin/packages/faodel/package.py
@@ -36,7 +36,11 @@ class Faodel(CMakePackage):
     variant('serializer', default='xdr',    values=('xdr', 'cereal'),             description='Use Cereal to serialize NNTI data structures else XDR')
 
     depends_on('mpi', when='+mpi')
-    depends_on('boost@1.60.0: +program_options+exception+locale+system+chrono+log+serialization+atomic+container+regex+thread+date_time')
+    depends_on(
+        'boost@1.60.0:'
+        '+program_options+exception+locale+system+chrono+log+serialization'
+        '+atomic+container+regex+thread+date_time'
+    )
     depends_on('cmake@3.8.0:', type='build')
     depends_on('hdf5+mpi', when='+hdf5+mpi')
     depends_on('hdf5~mpi', when='+hdf5~mpi')
diff --git a/var/spack/repos/builtin/packages/flexi/package.py b/var/spack/repos/builtin/packages/flexi/package.py
index f083ea34d9..7bc940db62 100644
--- a/var/spack/repos/builtin/packages/flexi/package.py
+++ b/var/spack/repos/builtin/packages/flexi/package.py
@@ -22,10 +22,26 @@ class Flexi(CMakePackage):
     variant('2d', default=False, description='If set to True the code will run in two-dimensional mode')
     variant('eqnsysname', default='navierstokes', values=('navierstokes', 'linearscalaradvection', 'rans_sa'), multi=False, description='Defines the equation system')
     variant('fv', default=False, description='Enables the usage of the finite volume subcell shock capturing mechanism')
-    variant('lifting', default='br1', values=('br1', 'br2'), multi=False, description='Two different lifting methods for the parabolic part of the equation system available')
+    variant(
+        'lifting',
+        default='br1',
+        values=('br1', 'br2'),
+        multi=False,
+        description=(
+            'Two different lifting methods for the parabolic part of '
+            'the equation system available'
+        )
+    )
     variant('nodetype', default='GAUSS', values=('GAUSS', 'GAUSS-LOBATTO'), multi=False, description='Space discretization basis function')
     variant('split', default=False, description='Split form of the discontinuous Galerkin operator')
-    variant('parabolic', default=True, description=' Defines, whether the parabolic part of the chosen system should be included or not')
+    variant(
+        'parabolic',
+        default=True,
+        description=(
+            'Defines whether the parabolic part of the chosen system '
+            'should be included or not'
+        )
+    )
     variant('testcase', default='default', values=('default', 'taylorgreenvortex', 'phill', 'channel', 'riemann2d'), multi=False, description='Defines the used test case')
     variant('viscosity', default='constant', values=('constant', 'sutherland', 'powerlaw'), multi=False, description='Defines modeling approach for viscosity')
     variant('eddy_viscosity', default=False, description='Enable eddy viscosity')
diff --git a/var/spack/repos/builtin/packages/folly/package.py b/var/spack/repos/builtin/packages/folly/package.py
index 87a77e2bf7..ed274bba9e 100644
--- a/var/spack/repos/builtin/packages/folly/package.py
+++ b/var/spack/repos/builtin/packages/folly/package.py
@@ -26,8 +26,16 @@ class Folly(CMakePackage):
 
     # folly requires gcc 5+ and a version of boost compiled with >= C++14
     variant('cxxstd', default='14', values=('14', '17'), multi=False, description='Use the specified C++ standard when building.')
-    depends_on('boost+context+container+exception+filesystem+program_options+regex+serialization+system+thread cxxstd=14', when='cxxstd=14')
-    depends_on('boost+context+container+exception+filesystem+program_options+regex+serialization+system+thread cxxstd=17', when='cxxstd=17')
+    depends_on(
+        'boost+context+container+exception+filesystem+program_options'
+        '+regex+serialization+system+thread cxxstd=14',
+        when='cxxstd=14'
+    )
+    depends_on(
+        'boost+context+container+exception+filesystem+program_options'
+        '+regex+serialization+system+thread cxxstd=17',
+        when='cxxstd=17'
+    )
 
     # required dependencies
     depends_on('gflags')
diff --git a/var/spack/repos/builtin/packages/gpi-space/package.py b/var/spack/repos/builtin/packages/gpi-space/package.py
index b023e6ef68..6354496be8 100644
--- a/var/spack/repos/builtin/packages/gpi-space/package.py
+++ b/var/spack/repos/builtin/packages/gpi-space/package.py
@@ -50,7 +50,11 @@ class GpiSpace(CMakePackage):
                type=("build", "run"))
     depends_on("pkgconfig",
                type="build")
-    depends_on("boost@1.62.0:1.63.0 +atomic +chrono +coroutine +context +date_time +filesystem +iostreams +program_options +random +regex +serialization +test +timer cxxstd=14")
+    depends_on(
+        "boost@1.62.0:1.63.0"
+        "+atomic +chrono +coroutine +context +date_time +filesystem +iostreams"
+        " +program_options +random +regex +serialization +test +timer cxxstd=14"
+    )
     depends_on("hwloc@1.10: +libudev ~shared ~libxml2")
     depends_on("libssh2@1.7:")
     depends_on("openssl@0.9:")
diff --git a/var/spack/repos/builtin/packages/gunrock/package.py b/var/spack/repos/builtin/packages/gunrock/package.py
index 6c4d1de56a..eac2f0d07f 100644
--- a/var/spack/repos/builtin/packages/gunrock/package.py
+++ b/var/spack/repos/builtin/packages/gunrock/package.py
@@ -32,7 +32,14 @@ class Gunrock(CMakePackage, CudaPackage):
     variant('lib',                  default=True,  description='Build main gunrock library')
     variant('shared_libs',          default=True,  description='Turn off to build for static libraries')
     variant('tests',                default=True,  description='Build functional tests / examples')
-    variant('mgpu_tests',           default=False, description='Builds Gunrock applications and enables the ctest framework for single GPU implementations')
+    variant(
+        'mgpu_tests',
+        default=False,
+        description=(
+            'Builds Gunrock applications and enables the ctest framework '
+            'for single GPU implementations'
+        )
+    )
     variant('cuda_verbose_ptxas',   default=False, description='Enable verbose output from the PTXAS assembler')
     variant('google_tests',         default=False, description='Build unit tests using googletest')
     variant('code_coverage',        default=False, description="run code coverage on Gunrock's source code")
diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py
index 99bea4be77..bca2149da8 100644
--- a/var/spack/repos/builtin/packages/hip/package.py
+++ b/var/spack/repos/builtin/packages/hip/package.py
@@ -130,8 +130,16 @@ class Hip(CMakePackage):
     # uses the ROCM_PATH variable again; just to be sure we set it to an empty
     # string.
     patch('0001-Make-it-possible-to-specify-the-package-folder-of-ro.patch', when='@3.5.0:4.5.3')
-    patch('0010-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.0.0.patch', when='@5.0.0')
-    patch('0011-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.0.2.patch', when='@5.0.2:')
+    patch(
+        '0010-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host'
+        '.5.0.0.patch',
+        when='@5.0.0'
+    )
+    patch(
+        '0011-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host'
+        '.5.0.2.patch',
+        when='@5.0.2:'
+    )
 
     # See https://github.com/ROCm-Developer-Tools/HIP/pull/2141
     patch('0002-Fix-detection-of-HIP_CLANG_ROOT.patch', when='@:3.9.0')
@@ -140,8 +148,16 @@ class Hip(CMakePackage):
     patch('0003-Improve-compilation-without-git-repo.3.7.0.patch', when='@3.7.0:3.9.0')
     patch('0003-Improve-compilation-without-git-repo.3.10.0.patch', when='@3.10.0:4.0.0')
     patch('0003-Improve-compilation-without-git-repo.4.1.0.patch', when='@4.1.0')
-    patch('0003-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.4.2.0.patch', when='@4.2.0:4.3.2')
-    patch('0009-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host_disabletests.4.5.0.patch', when='@4.5.0:4.5.3')
+    patch(
+        '0003-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host'
+        '.4.2.0.patch',
+        when='@4.2.0:4.3.2'
+    )
+    patch(
+        '0009-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host'
+        '_disabletests.4.5.0.patch',
+        when='@4.5.0:4.5.3'
+    )
     # See https://github.com/ROCm-Developer-Tools/HIP/pull/2219
     patch('0004-Drop-clang-rt-builtins-linking-on-hip-host.3.7.0.patch', when='@3.7.0:3.9.0')
     patch('0004-Drop-clang-rt-builtins-linking-on-hip-host.3.10.0.patch', when='@3.10.0:4.1.0')
diff --git a/var/spack/repos/builtin/packages/julia/package.py b/var/spack/repos/builtin/packages/julia/package.py
index 9b79e1467e..389df30d91 100644
--- a/var/spack/repos/builtin/packages/julia/package.py
+++ b/var/spack/repos/builtin/packages/julia/package.py
@@ -52,7 +52,11 @@ class Julia(MakefilePackage):
     # Note, we just use link_llvm_dylib so that we not only get a libLLVM,
     # but also so that llvm-config --libfiles gives only the dylib. Without
     # it it also gives static libraries, and breaks Julia's build.
-    depends_on('llvm targets=amdgpu,bpf,nvptx,webassembly version_suffix=jl +link_llvm_dylib ~internal_unwind')
+    depends_on(
+        "llvm"
+        " targets=amdgpu,bpf,nvptx,webassembly"
+        " version_suffix=jl +link_llvm_dylib ~internal_unwind"
+    )
     depends_on('libuv', when='@:1.7')
     depends_on('libuv-julia', when='@1.8:')
 
diff --git a/var/spack/repos/builtin/packages/libmaus2/package.py b/var/spack/repos/builtin/packages/libmaus2/package.py
index 3a4c818c7b..6df396bdab 100644
--- a/var/spack/repos/builtin/packages/libmaus2/package.py
+++ b/var/spack/repos/builtin/packages/libmaus2/package.py
@@ -20,7 +20,13 @@ class Libmaus2(AutotoolsPackage):
     depends_on('libtool',  type='build')
     depends_on('m4',       type='build')
 
-    conflicts('%gcc@:7.9', msg="libmaus2 uses std::filesystem. std::filesystem requires greater than or equal to GCC 8.")
+    conflicts(
+        '%gcc@:7.9',
+        msg=(
+            "libmaus2 uses std::filesystem. "
+            "std::filesystem requires greater than or equal to GCC 8."
+        )
+    )
 
     def setup_build_environment(self, env):
         if self.spec.satisfies('%gcc@8.0:8.9') or self.spec.satisfies('%fj'):
diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
index ce74666fe5..be2fb26d99 100644
--- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
+++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
@@ -39,7 +39,14 @@ class LlvmAmdgpu(CMakePackage):
     version('3.5.0', sha256='4878fa85473b24d88edcc89938441edc85d2e8a785e567b7bd7ce274ecc2fd9c', deprecated=True)
 
     variant('build_type', default='Release', values=("Release", "Debug", "RelWithDebInfo"), description='CMake build type')
-    variant('rocm-device-libs', default=True, description='Build ROCm device libs as external LLVM project instead of a standalone spack package.')
+    variant(
+        'rocm-device-libs',
+        default=True,
+        description=(
+            'Build ROCm device libs as external LLVM project instead of a '
+            'standalone spack package.'
+        )
+    )
     variant('openmp', default=False, description='Enable OpenMP')
     variant(
         'llvm_dylib',
diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py
index c31ea99741..649569d68e 100644
--- a/var/spack/repos/builtin/packages/mivisionx/package.py
+++ b/var/spack/repos/builtin/packages/mivisionx/package.py
@@ -78,7 +78,12 @@ class Mivisionx(CMakePackage):
     depends_on('cmake@3.5:', type='build')
     depends_on('ffmpeg@:4', type='build')
     depends_on('protobuf@:3', type='build')
-    depends_on('opencv@:3.4 +calib3d+features2d+highgui+imgcodecs+imgproc+video+videoio+flann+photo+objdetect', type='build')
+    depends_on(
+        'opencv@:3.4'
+        '+calib3d+features2d+highgui+imgcodecs+imgproc'
+        '+video+videoio+flann+photo+objdetect',
+        type='build'
+    )
     depends_on('rocm-opencl@3.5.0', when='@1.7')
     depends_on('rocm-cmake@3.5.0', type='build', when='@1.7')
     depends_on('miopen-opencl@3.5.0', when='@1.7')
diff --git a/var/spack/repos/builtin/packages/music/package.py b/var/spack/repos/builtin/packages/music/package.py
index 7f03830f87..b999da1e9d 100644
--- a/var/spack/repos/builtin/packages/music/package.py
+++ b/var/spack/repos/builtin/packages/music/package.py
@@ -9,7 +9,9 @@ from spack.package import *
 
 
 class Music(CMakePackage):
-    """MUSIC (Multi-Scale Initial Conditions for Cosmological Simulations) introduced in [Hahn and Abel][1]
+    """MUSIC (Multi-Scale Initial Conditions for Cosmological Simulations).
+
+    Introduced in [Hahn and Abel][1].
 
     [1]: https://arxiv.org/abs/1103.6031
     """
@@ -21,7 +23,14 @@ class Music(CMakePackage):
 
     version("2021-12-01", commit="6747c54f3b73ec36719c265fd96362849a83cb45")
 
-    variant("hdf5", default=False, description="Compile with HDF5. Some MUSIC output plug-ins---such as ENZO, Arepo and the MUSIC generic format---require HDF5.")
+    variant(
+        "hdf5",
+        default=False,
+        description=(
+            "Compile with HDF5. Required by Some MUSIC output plug-ins "
+            "(e.g., ENZO, Arepo and the MUSIC generic format"
+        ),
+    )
     variant("single_prec", default=False, description="Enable single-precision")
 
     depends_on("fftw@3:")
diff --git a/var/spack/repos/builtin/packages/nalu-wind/package.py b/var/spack/repos/builtin/packages/nalu-wind/package.py
index cc8584d275..ac426e9fe3 100644
--- a/var/spack/repos/builtin/packages/nalu-wind/package.py
+++ b/var/spack/repos/builtin/packages/nalu-wind/package.py
@@ -52,7 +52,11 @@ class NaluWind(CMakePackage, CudaPackage):
 
     depends_on('mpi')
     depends_on('yaml-cpp@0.5.3:')
-    depends_on('trilinos@stable: +exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist~superlu+hdf5+shards~hypre+gtest')
+    depends_on(
+        'trilinos@stable:'
+        '+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost'
+        '~superlu-dist~superlu+hdf5+shards~hypre+gtest'
+    )
     depends_on('trilinos~cuda~wrapper', when='~cuda')
     # Cannot build Trilinos as a shared library with STK on Darwin
     # https://github.com/trilinos/Trilinos/issues/2994
diff --git a/var/spack/repos/builtin/packages/nalu/package.py b/var/spack/repos/builtin/packages/nalu/package.py
index bd4baa2c9d..12a4adda3a 100644
--- a/var/spack/repos/builtin/packages/nalu/package.py
+++ b/var/spack/repos/builtin/packages/nalu/package.py
@@ -35,7 +35,12 @@ class Nalu(CMakePackage):
     # Cannot build Trilinos as a shared library with STK on Darwin
     # which is why we have a 'shared' variant for Nalu
     # https://github.com/trilinos/Trilinos/issues/2994
-    depends_on('trilinos+mpi+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+shards~hypre@master')
+    depends_on(
+        'trilinos'
+        '+mpi+exodus+tpetra+muelu+belos+ifpack2+amesos2+zoltan+stk+boost'
+        '~superlu-dist+superlu+hdf5+shards~hypre'
+        '@master'
+    )
     depends_on('trilinos~shared', when='~shared')
     # Optional dependencies
     depends_on('tioga', when='+tioga+shared')
diff --git a/var/spack/repos/builtin/packages/nektar/package.py b/var/spack/repos/builtin/packages/nektar/package.py
index c9941378ad..b7c92a7811 100644
--- a/var/spack/repos/builtin/packages/nektar/package.py
+++ b/var/spack/repos/builtin/packages/nektar/package.py
@@ -27,7 +27,11 @@ class Nektar(CMakePackage):
 
     depends_on('blas')
     depends_on('lapack')
-    depends_on('boost@1.56.0: +iostreams+exception+filesystem+system+chrono+serialization+atomic+regex+math+thread+container')
+    depends_on(
+        'boost@1.56.0:'
+        '+iostreams+exception+filesystem+system+chrono+serialization'
+        '+atomic+regex+math+thread+container'
+    )
     depends_on('tinyxml', when='platform=darwin')
 
     depends_on('mpi', when='+mpi')
diff --git a/var/spack/repos/builtin/packages/omnitrace/package.py b/var/spack/repos/builtin/packages/omnitrace/package.py
index 7ce19c9a89..6c2ba25639 100644
--- a/var/spack/repos/builtin/packages/omnitrace/package.py
+++ b/var/spack/repos/builtin/packages/omnitrace/package.py
@@ -27,8 +27,22 @@ class Omnitrace(CMakePackage):
     variant('tau', default=False, description='Enable support for using TAU markers in omnitrace instrumentation')
     variant('caliper', default=False, description='Enable support for using Caliper markers in omnitrace instrumentation')
     variant('perfetto_tools', default=False, description='Install perfetto tools (e.g. traced, perfetto)')
-    variant('mpi', default=False, description='Enable intercepting MPI functions and aggregating output during finalization (requires target application to use same MPI installation)')
-    variant('mpi_headers', default=True, description='Enable intercepting MPI functions but w/o support for aggregating output (target application can use any MPI installation)')
+    variant(
+        'mpi',
+        default=False,
+        description=(
+            'Enable intercepting MPI functions and aggregating output during finalization '
+            '(requires target application to use same MPI installation)'
+        )
+    )
+    variant(
+        'mpi_headers',
+        default=True,
+        description=(
+            'Enable intercepting MPI functions but w/o support for aggregating output '
+            '(target application can use any MPI installation)'
+        )
+    )
 
     extends('python', when='+python')
 
diff --git a/var/spack/repos/builtin/packages/percept/package.py b/var/spack/repos/builtin/packages/percept/package.py
index 116ec1841e..bea0bb247b 100644
--- a/var/spack/repos/builtin/packages/percept/package.py
+++ b/var/spack/repos/builtin/packages/percept/package.py
@@ -31,7 +31,13 @@ class Percept(CMakePackage):
     # See https://github.com/spack/spack/pull/22303 for reference
     depends_on(Boost.with_default_variants)
     depends_on('yaml-cpp+pic~shared@0.5.3:')
-    depends_on('trilinos~shared+exodus+mpi+tpetra+epetra+epetraext+muelu+belos+ifpack2+amesos2+zoltan+stk+boost~superlu-dist+superlu+hdf5+aztec+sacado~openmp+shards+intrepid@master,12.14.1:')
+    depends_on(
+        'trilinos'
+        '~shared+exodus+mpi+tpetra+epetra+epetraext+muelu+belos+ifpack2+amesos2'
+        '+zoltan+stk+boost~superlu-dist+superlu+hdf5+aztec+sacado'
+        '~openmp+shards+intrepid'
+        '@master,12.14.1:'
+    )
 
     def cmake_args(self):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/postgis/package.py b/var/spack/repos/builtin/packages/postgis/package.py
index 9101f5fa50..1c5c62e0e5 100644
--- a/var/spack/repos/builtin/packages/postgis/package.py
+++ b/var/spack/repos/builtin/packages/postgis/package.py
@@ -20,7 +20,14 @@ class Postgis(AutotoolsPackage):
     version('3.0.0', sha256='c06fd2cd5cea0119106ffe17a7235d893c2bbe6f4b63c8617c767630973ba594')
     version('2.5.3', sha256='72e8269d40f981e22fb2b78d3ff292338e69a4f5166e481a77b015e1d34e559a')
 
-    variant('gui', default=False, description='Build with GUI support, creating shp2pgsql-gui graphical interface to shp2pgsql')
+    variant(
+        'gui',
+        default=False,
+        description=(
+            'Build with GUI support, creating shp2pgsql-gui graphical interface '
+            'to shp2pgsql'
+        )
+    )
 
     # Refs:
     # https://postgis.net/docs/postgis_installation.html
diff --git a/var/spack/repos/builtin/packages/py-abipy/package.py b/var/spack/repos/builtin/packages/py-abipy/package.py
index 5af2e8c754..325b726652 100644
--- a/var/spack/repos/builtin/packages/py-abipy/package.py
+++ b/var/spack/repos/builtin/packages/py-abipy/package.py
@@ -18,7 +18,15 @@ class PyAbipy(PythonPackage):
     variant('gui',     default=False, description='Build the GUI')
     variant('ipython', default=False, description='Build IPython support')
 
-    extends('python', ignore='bin/(feff_.*|gaussian_analyzer|get_environment|html2text|nc3tonc4|nc4tonc3|ncinfo|pmg|pydii|tabulate|tqdm)')
+    extends(
+        'python',
+        ignore=(
+            'bin/('
+            'feff_.*|gaussian_analyzer|get_environment|html2text|'
+            'nc3tonc4|nc4tonc3|ncinfo|pmg|pydii|tabulate|tqdm'
+            ')'
+        )
+    )
 
     depends_on('python@2.7:')
 
diff --git a/var/spack/repos/builtin/packages/r3d/package.py b/var/spack/repos/builtin/packages/r3d/package.py
index fddf52e69a..e5fb9eb704 100644
--- a/var/spack/repos/builtin/packages/r3d/package.py
+++ b/var/spack/repos/builtin/packages/r3d/package.py
@@ -21,7 +21,14 @@ class R3d(CMakePackage):
     version('2018-12-19', commit='47308f68c782ed3227d3dab1eff24d41f6421f21', deprecated=True)
     version('2018-01-07', commit='d6799a582256a120ef3bd7e18959e96cba0e5495', deprecated=True)
 
-    variant("r3d_max_verts", default='0', description="Maximum number of vertices allowed in a polyhedron (versions 2021-03-10 or later)")
+    variant(
+        "r3d_max_verts",
+        default='0',
+        description=(
+            "Maximum number of vertices allowed in a polyhedron "
+            "(versions 2021-03-10 or later)"
+        )
+    )
 
     # Bypass CMake for older builds
     variant("test",  default=False, description="Build R3D regression tests (versions 2019-04-24 or earlier)")
diff --git a/var/spack/repos/builtin/packages/relion/package.py b/var/spack/repos/builtin/packages/relion/package.py
index 68b67b695a..a8bd0626e8 100644
--- a/var/spack/repos/builtin/packages/relion/package.py
+++ b/var/spack/repos/builtin/packages/relion/package.py
@@ -50,7 +50,14 @@ class Relion(CMakePackage, CudaPackage):
     # these new values were added in relion 3
     # do not seem to cause problems with < 3
     variant('mklfft', default=True, description='Use MKL rather than FFTW for FFT')
-    variant('allow_ctf_in_sagd', default=True, description='Allow CTF-modulation in SAGD, as specified in Claim 1 of patent US10,282,513B2')
+    variant(
+        'allow_ctf_in_sagd',
+        default=True,
+        description=(
+            'Allow CTF-modulation in SAGD, '
+            'as specified in Claim 1 of patent US10,282,513B2'
+        )
+    )
     variant('altcpu', default=False, description='Use CPU acceleration', when='~cuda')
 
     variant('external_motioncor2',
diff --git a/var/spack/repos/builtin/packages/salmon/package.py b/var/spack/repos/builtin/packages/salmon/package.py
index 3a5507bbfb..367c770d20 100644
--- a/var/spack/repos/builtin/packages/salmon/package.py
+++ b/var/spack/repos/builtin/packages/salmon/package.py
@@ -23,8 +23,18 @@ class Salmon(CMakePackage):
             values=('DEBUG', 'RELEASE'))
 
     depends_on('tbb')
-    depends_on('boost@1.66.0:+program_options+exception+filesystem+system+chrono+serialization+random+graph+timer+iostreams+math+thread+container', when='@:0.14.1')
-    depends_on('boost@1.72.0:+program_options+exception+filesystem+system+chrono+serialization+random+graph+timer+iostreams+math+thread+container', when='@1.4.0:')
+    depends_on(
+        'boost@1.66.0:'
+        '+program_options+exception+filesystem+system+chrono+serialization'
+        '+random+graph+timer+iostreams+math+thread+container',
+        when='@:0.14.1',
+    )
+    depends_on(
+        'boost@1.72.0:'
+        '+program_options+exception+filesystem+system+chrono+serialization'
+        '+random+graph+timer+iostreams+math+thread+container',
+        when='@1.4.0:',
+    )
     depends_on('cereal')
     depends_on('jemalloc')
     depends_on('xz')
diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py
index 644eff32eb..95bd599326 100644
--- a/var/spack/repos/builtin/packages/scotch/package.py
+++ b/var/spack/repos/builtin/packages/scotch/package.py
@@ -148,7 +148,11 @@ class Scotch(CMakePackage):
                     ),
                     'RANLIB    = echo',
                     'AR        = $(CC)',
-                    'ARFLAGS   = -dynamiclib $(LDFLAGS) -Wl,-install_name -Wl,%s/$(notdir $@) -undefined dynamic_lookup -o ' % prefix.lib  # noqa
+                    (
+                        'ARFLAGS = -dynamiclib $(LDFLAGS) '
+                        '-Wl,-install_name -Wl,%s/$(notdir $@) '
+                        '-undefined dynamic_lookup -o '
+                    ) % prefix.lib,
                 ])
             else:
                 makefile_inc.extend([
diff --git a/var/spack/repos/builtin/packages/shiny-server/package.py b/var/spack/repos/builtin/packages/shiny-server/package.py
index d627469da1..036cd124ce 100644
--- a/var/spack/repos/builtin/packages/shiny-server/package.py
+++ b/var/spack/repos/builtin/packages/shiny-server/package.py
@@ -45,7 +45,11 @@ class ShinyServer(CMakePackage):
         bash = which('bash')
         mkdirp('build')
         bash('-c', 'bin/npm --python="$PYTHON" install')
-        bash('-c', 'bin/node ./ext/node/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js --python="$PYTHON" rebuild')  # noqa: E501
+        bash(
+            '-c',
+            'bin/node ./ext/node/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js '
+            '--python="$PYTHON" rebuild'
+        )
 
     def setup_run_environment(self, env):
         env.prepend_path('PATH', join_path(self.prefix, 'shiny-server', 'bin'))
diff --git a/var/spack/repos/builtin/packages/strelka/package.py b/var/spack/repos/builtin/packages/strelka/package.py
index 19ae0e81cb..cb473c705a 100644
--- a/var/spack/repos/builtin/packages/strelka/package.py
+++ b/var/spack/repos/builtin/packages/strelka/package.py
@@ -32,4 +32,8 @@ class Strelka(CMakePackage):
     depends_on('zlib')
     depends_on('bzip2')
     depends_on('cmake@2.8.5:', type='build')
-    depends_on('boost@1.56.0: +program_options+exception+filesystem+system+chrono+serialization+timer+container+test+math')
+    depends_on(
+        'boost@1.56.0:'
+        '+program_options+exception+filesystem+system+chrono+serialization+timer'
+        '+container+test+math'
+    )
diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py
index 28aff2ffdf..139bb3e79d 100644
--- a/var/spack/repos/builtin/packages/superlu-dist/package.py
+++ b/var/spack/repos/builtin/packages/superlu-dist/package.py
@@ -40,7 +40,14 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage):
     version('5.0.0', sha256='78d1d6460ff16b3f71e4bcd7306397574d54d421249553ccc26567f00a10bfc6')
 
     variant('int64', default=False, description='Build with 64 bit integers')
-    variant('openmp', default=False, description='Build with OpenMP support (needs a good multithreaded BLAS implementation for good performance)')
+    variant(
+        'openmp',
+        default=False,
+        description=(
+            'Build with OpenMP support '
+            '(needs a good multithreaded BLAS implementation for good performance)'
+        )
+    )
     variant('shared', default=True, description='Build shared libraries')
 
     depends_on('mpi')
diff --git a/var/spack/repos/builtin/packages/xyce/package.py b/var/spack/repos/builtin/packages/xyce/package.py
index 06a8a95256..b02e918944 100644
--- a/var/spack/repos/builtin/packages/xyce/package.py
+++ b/var/spack/repos/builtin/packages/xyce/package.py
@@ -56,7 +56,13 @@ class Xyce(CMakePackage):
     depends_on('py-pip', type='run', when='+pymi')
     depends_on('py-pybind11@2.6.1:', type=('build', 'link'), when='+pymi')
 
-    depends_on('trilinos +amesos+amesos2+anasazi+aztec+basker+belos+complex+epetra+epetraext+explicit_template_instantiation+fortran+ifpack+isorropia+kokkos+nox+sacado+suite-sparse+trilinoscouplings+zoltan+stokhos+epetraextbtf+epetraextexperimental+epetraextgraphreorderings')
+    depends_on(
+        'trilinos'
+        '+amesos+amesos2+anasazi+aztec+basker+belos+complex+epetra+epetraext'
+        '+explicit_template_instantiation+fortran+ifpack+isorropia+kokkos+nox'
+        '+sacado+suite-sparse+trilinoscouplings+zoltan+stokhos+epetraextbtf'
+        '+epetraextexperimental+epetraextgraphreorderings'
+    )
     # tested versions of Trilinos for everything up to 7.4.0
     depends_on('trilinos@12.12.1:13.2.0', when='@:7.4.0')
     depends_on('trilinos gotype=all cxxstd=11', when='^trilinos@:12.15')