From 3fa090f49030b36eb1e4038280504ce3cc1e1de0 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Sat, 23 Jul 2022 17:54:51 -0700 Subject: black: break up long strings that black cannot fix --- var/spack/repos/builtin/packages/albany/package.py | 7 ++++++- var/spack/repos/builtin/packages/alps/package.py | 15 ++++++++------ var/spack/repos/builtin/packages/bazel/package.py | 7 ++++++- .../repos/builtin/packages/camellia/package.py | 7 ++++++- .../repos/builtin/packages/damaris/package.py | 14 +++++++++++-- .../repos/builtin/packages/denovogear/package.py | 6 +++++- var/spack/repos/builtin/packages/erne/package.py | 7 ++++++- .../repos/builtin/packages/express/package.py | 6 +++++- var/spack/repos/builtin/packages/faodel/package.py | 6 +++++- var/spack/repos/builtin/packages/flexi/package.py | 20 ++++++++++++++++-- var/spack/repos/builtin/packages/folly/package.py | 12 +++++++++-- .../repos/builtin/packages/gpi-space/package.py | 6 +++++- .../repos/builtin/packages/gunrock/package.py | 9 +++++++- var/spack/repos/builtin/packages/hip/package.py | 24 ++++++++++++++++++---- var/spack/repos/builtin/packages/julia/package.py | 6 +++++- .../repos/builtin/packages/libmaus2/package.py | 8 +++++++- .../repos/builtin/packages/llvm-amdgpu/package.py | 9 +++++++- .../repos/builtin/packages/mivisionx/package.py | 7 ++++++- var/spack/repos/builtin/packages/music/package.py | 13 ++++++++++-- .../repos/builtin/packages/nalu-wind/package.py | 6 +++++- var/spack/repos/builtin/packages/nalu/package.py | 7 ++++++- var/spack/repos/builtin/packages/nektar/package.py | 6 +++++- .../repos/builtin/packages/omnitrace/package.py | 18 ++++++++++++++-- .../repos/builtin/packages/percept/package.py | 8 +++++++- .../repos/builtin/packages/postgis/package.py | 9 +++++++- .../repos/builtin/packages/py-abipy/package.py | 10 ++++++++- var/spack/repos/builtin/packages/r3d/package.py | 9 +++++++- var/spack/repos/builtin/packages/relion/package.py | 9 +++++++- var/spack/repos/builtin/packages/salmon/package.py | 14 +++++++++++-- var/spack/repos/builtin/packages/scotch/package.py | 6 +++++- .../repos/builtin/packages/shiny-server/package.py | 6 +++++- .../repos/builtin/packages/strelka/package.py | 6 +++++- .../repos/builtin/packages/superlu-dist/package.py | 9 +++++++- var/spack/repos/builtin/packages/xyce/package.py | 8 +++++++- 34 files changed, 272 insertions(+), 48 deletions(-) (limited to 'var') 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') -- cgit v1.2.3-60-g2f50