Remove unneeded noqa comments.

This commit is contained in:
Todd Gamblin 2016-08-10 14:05:59 -07:00
parent db59f87e32
commit 84e331c586
20 changed files with 109 additions and 60 deletions

View File

@ -51,15 +51,23 @@ def patch(self):
kwargs = {'ignore_absent': False, 'backup': False, 'string': True} kwargs = {'ignore_absent': False, 'backup': False, 'string': True}
mf = FileFilter('Makefile-libbz2_so') mf = FileFilter('Makefile-libbz2_so')
mf.filter('$(CC) -shared -Wl,-soname -Wl,libbz2.so.{0} -o libbz2.so.{1} $(OBJS)'.format(v2, v3), # NOQA ignore=E501 mf.filter('$(CC) -shared -Wl,-soname -Wl,libbz2.so.{0} -o libbz2.so.{1} $(OBJS)' # noqa
'$(CC) -dynamiclib -Wl,-install_name -Wl,@rpath/libbz2.{0}.dylib -current_version {1} -compatibility_version {2} -o libbz2.{3}.dylib $(OBJS)'.format(v1, v2, v3, v3), **kwargs) # NOQA ignore=E501 .format(v2, v3),
'$(CC) -dynamiclib -Wl,-install_name -Wl,@rpath/libbz2.{0}.dylib -current_version {1} -compatibility_version {2} -o libbz2.{3}.dylib $(OBJS)' # noqa
.format(v1, v2, v3, v3),
**kwargs)
mf.filter('$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.{0}'.format(v3), # NOQA ignore=E501 mf.filter(
'$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.{0}.dylib'.format(v3), **kwargs) # NOQA ignore=E501 '$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.{0}'.format(v3), # noqa
mf.filter('rm -f libbz2.so.{0}'.format(v2), '$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.{0}.dylib'
'rm -f libbz2.{0}.dylib'.format(v2), **kwargs) .format(v3), **kwargs)
mf.filter('ln -s libbz2.so.{0} libbz2.so.{1}'.format(v3, v2), mf.filter(
'ln -s libbz2.{0}.dylib libbz2.{1}.dylib'.format(v3, v2), **kwargs) # NOQA ignore=E501 'rm -f libbz2.so.{0}'.format(v2),
'rm -f libbz2.{0}.dylib'.format(v2), **kwargs)
mf.filter(
'ln -s libbz2.so.{0} libbz2.so.{1}'.format(v3, v2),
'ln -s libbz2.{0}.dylib libbz2.{1}.dylib'.format(v3, v2),
**kwargs)
def install(self, spec, prefix): def install(self, spec, prefix):
# Build the dynamic library first # Build the dynamic library first
@ -73,10 +81,12 @@ def install(self, spec, prefix):
v1, v2, v3 = (self.spec.version.up_to(i) for i in (1, 2, 3)) v1, v2, v3 = (self.spec.version.up_to(i) for i in (1, 2, 3))
if 'darwin' in self.spec.architecture: if 'darwin' in self.spec.architecture:
lib = 'libbz2.dylib' lib = 'libbz2.dylib'
lib1, lib2, lib3 = ('libbz2.{0}.dylib'.format(v) for v in (v1, v2, v3)) # NOQA ignore=E501 lib1, lib2, lib3 = ('libbz2.{0}.dylib'.format(v)
for v in (v1, v2, v3))
else: else:
lib = 'libbz2.so' lib = 'libbz2.so'
lib1, lib2, lib3 = ('libbz2.so.{0}'.format(v) for v in (v1, v2, v3)) # NOQA ignore=E501 lib1, lib2, lib3 = ('libbz2.so.{0}'.format(v)
for v in (v1, v2, v3))
install(lib3, join_path(prefix.lib, lib3)) install(lib3, join_path(prefix.lib, lib3))
with working_dir(prefix.lib): with working_dir(prefix.lib):

View File

@ -174,7 +174,8 @@ def install(self, spec, prefix):
# Optional dependencies for which librariy names are the same as CMake # Optional dependencies for which librariy names are the same as CMake
# variables: # variables:
for library in ('gsl', 'hdf5', 'p4est', 'petsc', 'slepc', 'trilinos', 'metis'): # NOQA: ignore=E501 for library in (
'gsl', 'hdf5', 'p4est', 'petsc', 'slepc', 'trilinos', 'metis'):
if library in spec: if library in spec:
options.extend([ options.extend([
'-D%s_DIR=%s' % (library.upper(), spec[library].prefix), '-D%s_DIR=%s' % (library.upper(), spec[library].prefix),
@ -305,15 +306,20 @@ def install(self, spec, prefix):
print('=== Step-40 Trilinos SuperluDist ====') print('=== Step-40 Trilinos SuperluDist ====')
print('=====================================') print('=====================================')
# change to direct solvers # change to direct solvers
filter_file(r'(LA::SolverCG solver\(solver_control\);)', ('TrilinosWrappers::SolverDirect::AdditionalData data(false,"Amesos_Superludist"); TrilinosWrappers::SolverDirect solver(solver_control,data);'), 'step-40.cc') # NOQA: ignore=E501 filter_file(r'(LA::SolverCG solver\(solver_control\);)', ('TrilinosWrappers::SolverDirect::AdditionalData data(false,"Amesos_Superludist"); TrilinosWrappers::SolverDirect solver(solver_control,data);'), 'step-40.cc') # noqa
filter_file(r'(LA::MPI::PreconditionAMG preconditioner;)', filter_file(
(''), 'step-40.cc') r'(LA::MPI::PreconditionAMG preconditioner;)',
filter_file(r'(LA::MPI::PreconditionAMG::AdditionalData data;)', # NOQA: ignore=E501 (''), 'step-40.cc')
(''), 'step-40.cc') filter_file(
filter_file(r'(preconditioner.initialize\(system_matrix, data\);)', # NOQA: ignore=E501 r'(LA::MPI::PreconditionAMG::AdditionalData data;)',
(''), 'step-40.cc') (''), 'step-40.cc')
filter_file(r'(solver\.solve \(system_matrix, completely_distributed_solution, system_rhs,)', ('solver.solve (system_matrix, completely_distributed_solution, system_rhs);'), 'step-40.cc') # NOQA: ignore=E501 filter_file(
filter_file(r'(preconditioner\);)', (''), 'step-40.cc') r'(preconditioner.initialize\(system_matrix, data\);)',
(''), 'step-40.cc')
filter_file(
r'(solver\.solve \(system_matrix, completely_distributed_solution, system_rhs,)', ('solver.solve (system_matrix, completely_distributed_solution, system_rhs);'), 'step-40.cc') # noqa
filter_file(
r'(preconditioner\);)', (''), 'step-40.cc')
if '^trilinos+superlu-dist' in spec: if '^trilinos+superlu-dist' in spec:
make('release') make('release')
make('run', paralle=False) make('run', paralle=False)

View File

@ -36,7 +36,7 @@ class Fenics(Package):
homepage = "http://fenicsproject.org/" homepage = "http://fenicsproject.org/"
url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-1.6.0.tar.gz" url = "https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-1.6.0.tar.gz"
base_url = "https://bitbucket.org/fenics-project/{pkg}/downloads/{pkg}-{version}.tar.gz" # NOQA: ignore E501 base_url = "https://bitbucket.org/fenics-project/{pkg}/downloads/{pkg}-{version}.tar.gz"
variant('hdf5', default=True, description='Compile with HDF5') variant('hdf5', default=True, description='Compile with HDF5')
variant('parmetis', default=True, description='Compile with ParMETIS') variant('parmetis', default=True, description='Compile with ParMETIS')

View File

@ -37,7 +37,9 @@ class Graphviz(Package):
# related to missing Perl packages. If spack begins support for Perl in the # related to missing Perl packages. If spack begins support for Perl in the
# future, this package can be updated to depend_on('perl') and the # future, this package can be updated to depend_on('perl') and the
# ncecessary devel packages. # ncecessary devel packages.
variant('perl', default=False, description='Enable if you need the optional Perl language bindings.') # NOQA: ignore=E501 variant(
'perl', default=False,
description='Enable if you need the optional Perl language bindings.')
parallel = False parallel = False

View File

@ -48,7 +48,9 @@ class Gromacs(Package):
variant('shared', default=True, variant('shared', default=True,
description='Enables the build of shared libraries') description='Enables the build of shared libraries')
variant('debug', default=False, description='Enables debug mode') variant('debug', default=False, description='Enables debug mode')
variant('double', default=False, description='Produces a double precision version of the executables') # NOQA: ignore=E501 variant(
'double', default=False,
description='Produces a double precision version of the executables')
variant('plumed', default=False, description='Enable PLUMED support') variant('plumed', default=False, description='Enable PLUMED support')
depends_on('mpi', when='+mpi') depends_on('mpi', when='+mpi')

View File

@ -72,10 +72,10 @@ def install(self, spec, prefix):
# TODO: these vars are not used. # TODO: these vars are not used.
# if "+mpi" in spec["hdf5"]: # if "+mpi" in spec["hdf5"]:
# cc = "mpicc" # noqa # cc = "mpicc"
# else: # else:
# cc = "cc" # noqa # cc = "cc"
# shlibext = "so" if sys.platform != "darwin" else "dylib" # noqa # shlibext = "so" if sys.platform != "darwin" else "dylib"
mkdirp(prefix.include) mkdirp(prefix.include)
mkdirp(prefix.lib) mkdirp(prefix.lib)

View File

@ -83,10 +83,10 @@ class Intel(IntelInstaller):
# TODO: can also try the online installer (will download files on demand) # TODO: can also try the online installer (will download files on demand)
version('16.0.2', '1133fb831312eb519f7da897fec223fa', version('16.0.2', '1133fb831312eb519f7da897fec223fa',
url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz" # NOQA: ignore=E501 url="file://%s/parallel_studio_xe_2016_composer_edition_update2.tgz"
% os.getcwd()) % os.getcwd())
version('16.0.3', '3208eeabee951fc27579177b593cefe9', version('16.0.3', '3208eeabee951fc27579177b593cefe9',
url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz" # NOQA: ignore=E501 url="file://%s/parallel_studio_xe_2016_composer_edition_update3.tgz"
% os.getcwd()) % os.getcwd())
variant('rpath', default=True, description="Add rpath to .cfg files") variant('rpath', default=True, description="Add rpath to .cfg files")

View File

@ -35,7 +35,7 @@
class Jdk(Package): class Jdk(Package):
"""The Java Development Kit (JDK) released by Oracle Corporation """The Java Development Kit (JDK) released by Oracle Corporation
in the form of a binary product aimed at Java developers.""" in the form of a binary product aimed at Java developers."""
homepage = "http://www.oracle.com/technetwork/java/javase/downloads/index.html" # noqa: E501 homepage = "http://www.oracle.com/technetwork/java/javase/downloads/index.html"
version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf', version('8u66-linux-x64', '88f31f3d642c3287134297b8c10e61bf',
url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz") url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz")
@ -47,7 +47,7 @@ class Jdk(Package):
# automate this process, we need to utilize these additional curl # automate this process, we need to utilize these additional curl
# commandline options. # commandline options.
# #
# See http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux # noqa: E501 # See http://stackoverflow.com/questions/10268583/how-to-automate-download-and-installation-of-java-jdk-on-linux
curl_options = [ curl_options = [
'-j', # junk cookies '-j', # junk cookies
'-H', # specify required License Agreement cookie '-H', # specify required License Agreement cookie

View File

@ -29,7 +29,7 @@ class Launchmon(Package):
"""Software infrastructure that enables HPC run-time tools to """Software infrastructure that enables HPC run-time tools to
co-locate tool daemons with a parallel job.""" co-locate tool daemons with a parallel job."""
homepage = "https://github.com/LLNL/LaunchMON" homepage = "https://github.com/LLNL/LaunchMON"
url = "https://github.com/LLNL/LaunchMON/releases/download/v1.0.2/launchmon-v1.0.2.tar.gz" # NOQA: ignore=E501 url = "https://github.com/LLNL/LaunchMON/releases/download/v1.0.2/launchmon-v1.0.2.tar.gz"
version('1.0.2', '8d6ba77a0ec2eff2fde2c5cc8fa7ff7a') version('1.0.2', '8d6ba77a0ec2eff2fde2c5cc8fa7ff7a')

View File

@ -35,7 +35,7 @@ class Lmod(Package):
variable. Modulefiles for Library packages provide environment variables variable. Modulefiles for Library packages provide environment variables
that specify where the library and header files can be found. that specify where the library and header files can be found.
""" """
homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod' # NOQA: ignore=E501 homepage = 'https://www.tacc.utexas.edu/research-development/tacc-projects/lmod'
url = 'https://github.com/TACC/Lmod/archive/6.4.1.tar.gz' url = 'https://github.com/TACC/Lmod/archive/6.4.1.tar.gz'
version('6.4.5', '14f6c58dbc0a5a75574d795eac2c1e3c') version('6.4.5', '14f6c58dbc0a5a75574d795eac2c1e3c')

View File

@ -37,9 +37,12 @@ class Openblas(Package):
version('0.2.16', 'fef46ab92463bdbb1479dcec594ef6dc') version('0.2.16', 'fef46ab92463bdbb1479dcec594ef6dc')
version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9') version('0.2.15', 'b1190f3d3471685f17cfd1ec1d252ac9')
variant('shared', default=True, description="Build shared libraries as well as static libs.") # NOQA: ignore=E501 variant('shared', default=True,
variant('openmp', default=False, description="Enable OpenMP support.") description="Build shared libraries as well as static libs.")
variant('fpic', default=True, description="Build position independent code") # NOQA: ignore=E501 variant('openmp', default=False,
description="Enable OpenMP support.")
variant('fpic', default=True,
description="Build position independent code")
# virtual dependency # virtual dependency
provides('blas') provides('blas')

View File

@ -108,7 +108,8 @@ class Openmpi(Package):
depends_on('sqlite', when='+sqlite3') depends_on('sqlite', when='+sqlite3')
def url_for_version(self, version): def url_for_version(self, version):
return "http://www.open-mpi.org/software/ompi/v%s/downloads/openmpi-%s.tar.bz2" % (version.up_to(2), version) # NOQA: ignore=E501 return "http://www.open-mpi.org/software/ompi/v%s/downloads/openmpi-%s.tar.bz2" % (
version.up_to(2), version)
def setup_dependent_environment(self, spack_env, run_env, dependent_spec): def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc')) spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc'))

View File

@ -50,9 +50,9 @@ class Parmetis(Package):
patch('enable_external_metis.patch') patch('enable_external_metis.patch')
# bug fixes from PETSc developers # bug fixes from PETSc developers
# https://bitbucket.org/petsc/pkg-parmetis/commits/1c1a9fd0f408dc4d42c57f5c3ee6ace411eb222b/raw/ # NOQA: ignore=E501 # https://bitbucket.org/petsc/pkg-parmetis/commits/1c1a9fd0f408dc4d42c57f5c3ee6ace411eb222b/raw/
patch('pkg-parmetis-1c1a9fd0f408dc4d42c57f5c3ee6ace411eb222b.patch') patch('pkg-parmetis-1c1a9fd0f408dc4d42c57f5c3ee6ace411eb222b.patch')
# https://bitbucket.org/petsc/pkg-parmetis/commits/82409d68aa1d6cbc70740d0f35024aae17f7d5cb/raw/ # NOQA: ignore=E501 # https://bitbucket.org/petsc/pkg-parmetis/commits/82409d68aa1d6cbc70740d0f35024aae17f7d5cb/raw/
patch('pkg-parmetis-82409d68aa1d6cbc70740d0f35024aae17f7d5cb.patch') patch('pkg-parmetis-82409d68aa1d6cbc70740d0f35024aae17f7d5cb.patch')
def url_for_version(self, version): def url_for_version(self, version):

View File

@ -81,7 +81,7 @@ class Petsc(Package):
# Hypre does not support complex numbers. # Hypre does not support complex numbers.
# Also PETSc prefer to build it without internal superlu, likely due to # Also PETSc prefer to build it without internal superlu, likely due to
# conflict in headers see # conflict in headers see
# https://bitbucket.org/petsc/petsc/src/90564b43f6b05485163c147b464b5d6d28cde3ef/config/BuildSystem/config/packages/hypre.py # NOQA: ignore=E501 # https://bitbucket.org/petsc/petsc/src/90564b43f6b05485163c147b464b5d6d28cde3ef/config/BuildSystem/config/packages/hypre.py
depends_on('hypre~internal-superlu', when='+hypre+mpi~complex') depends_on('hypre~internal-superlu', when='+hypre+mpi~complex')
depends_on('superlu-dist@:4.3', when='@:3.6.4+superlu-dist+mpi') depends_on('superlu-dist@:4.3', when='@:3.6.4+superlu-dist+mpi')
depends_on('superlu-dist@5.0.0:', when='@3.7:+superlu-dist+mpi') depends_on('superlu-dist@5.0.0:', when='@3.7:+superlu-dist+mpi')
@ -92,17 +92,21 @@ def mpi_dependent_options(self):
if '~mpi' in self.spec: if '~mpi' in self.spec:
compiler_opts = [ compiler_opts = [
'--with-cc=%s' % os.environ['CC'], '--with-cc=%s' % os.environ['CC'],
'--with-cxx=%s' % (os.environ['CXX'] if self.compiler.cxx is not None else '0'), # NOQA: ignore=E501 '--with-cxx=%s' % (os.environ['CXX']
'--with-fc=%s' % (os.environ['FC'] if self.compiler.fc is not None else '0'), # NOQA: ignore=E501 if self.compiler.cxx is not None else '0'),
'--with-fc=%s' % (os.environ['FC']
if self.compiler.fc is not None else '0'),
'--with-mpi=0' '--with-mpi=0'
] ]
error_message_fmt = '\t{library} support requires "+mpi" to be activated' # NOQA: ignore=E501 error_message_fmt = \
'\t{library} support requires "+mpi" to be activated'
# If mpi is disabled (~mpi), it's an error to have any of these # If mpi is disabled (~mpi), it's an error to have any of these
# enabled. This generates a list of any such errors. # enabled. This generates a list of any such errors.
errors = [error_message_fmt.format(library=x) errors = [
for x in ('hdf5', 'hypre', 'parmetis', 'mumps', 'superlu-dist') # NOQA: ignore=E501 error_message_fmt.format(library=x)
if ('+' + x) in self.spec] for x in ('hdf5', 'hypre', 'parmetis', 'mumps', 'superlu-dist')
if ('+' + x) in self.spec]
if errors: if errors:
errors = ['incompatible variants given'] + errors errors = ['incompatible variants given'] + errors
raise RuntimeError('\n'.join(errors)) raise RuntimeError('\n'.join(errors))
@ -117,8 +121,10 @@ def install(self, spec, prefix):
options = ['--with-ssl=0'] options = ['--with-ssl=0']
options.extend(self.mpi_dependent_options()) options.extend(self.mpi_dependent_options())
options.extend([ options.extend([
'--with-precision=%s' % ('double' if '+double' in spec else 'single'), # NOQA: ignore=E501 '--with-precision=%s' % (
'--with-scalar-type=%s' % ('complex' if '+complex' in spec else 'real'), # NOQA: ignore=E501 'double' if '+double' in spec else 'single'),
'--with-scalar-type=%s' % (
'complex' if '+complex' in spec else 'real'),
'--with-shared-libraries=%s' % ('1' if '+shared' in spec else '0'), '--with-shared-libraries=%s' % ('1' if '+shared' in spec else '0'),
'--with-debugging=%s' % ('1' if '+debug' in spec else '0'), '--with-debugging=%s' % ('1' if '+debug' in spec else '0'),
'--with-blas-lapack-dir=%s' % spec['lapack'].prefix '--with-blas-lapack-dir=%s' % spec['lapack'].prefix
@ -127,11 +133,13 @@ def install(self, spec, prefix):
for library in ('metis', 'boost', 'hdf5', 'hypre', 'parmetis', for library in ('metis', 'boost', 'hdf5', 'hypre', 'parmetis',
'mumps', 'scalapack'): 'mumps', 'scalapack'):
options.append( options.append(
'--with-{library}={value}'.format(library=library, value=('1' if library in spec else '0')) # NOQA: ignore=E501 '--with-{library}={value}'.format(
library=library, value=('1' if library in spec else '0'))
) )
if library in spec: if library in spec:
options.append( options.append(
'--with-{library}-dir={path}'.format(library=library, path=spec[library].prefix) # NOQA: ignore=E501 '--with-{library}-dir={path}'.format(
library=library, path=spec[library].prefix)
) )
# PETSc does not pick up SuperluDist from the dir as they look for # PETSc does not pick up SuperluDist from the dir as they look for
# superlu_dist_4.1.a # superlu_dist_4.1.a
@ -165,13 +173,25 @@ def install(self, spec, prefix):
run = Executable(join_path(spec['mpi'].prefix.bin, 'mpirun')) run = Executable(join_path(spec['mpi'].prefix.bin, 'mpirun'))
run('ex50', '-da_grid_x', '4', '-da_grid_y', '4') run('ex50', '-da_grid_x', '4', '-da_grid_y', '4')
if 'superlu-dist' in spec: if 'superlu-dist' in spec:
run('ex50', '-da_grid_x', '4', '-da_grid_y', '4', '-pc_type', 'lu', '-pc_factor_mat_solver_package', 'superlu_dist') # NOQA: ignore=E501 run('ex50',
'-da_grid_x', '4',
'-da_grid_y', '4',
'-pc_type', 'lu',
'-pc_factor_mat_solver_package', 'superlu_dist')
if 'mumps' in spec: if 'mumps' in spec:
run('ex50', '-da_grid_x', '4', '-da_grid_y', '4', '-pc_type', 'lu', '-pc_factor_mat_solver_package', 'mumps') # NOQA: ignore=E501 run('ex50',
'-da_grid_x', '4',
'-da_grid_y', '4',
'-pc_type', 'lu',
'-pc_factor_mat_solver_package', 'mumps')
if 'hypre' in spec: if 'hypre' in spec:
run('ex50', '-da_grid_x', '4', '-da_grid_y', '4', '-pc_type', 'hypre', '-pc_hypre_type', 'boomeramg') # NOQA: ignore=E501 run('ex50',
'-da_grid_x', '4',
'-da_grid_y', '4',
'-pc_type', 'hypre',
'-pc_hypre_type', 'boomeramg')
def setup_dependent_environment(self, spack_env, run_env, dependent_spec): def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
# set up PETSC_DIR for everyone using PETSc package # set up PETSC_DIR for everyone using PETSc package

View File

@ -102,7 +102,7 @@ def install(self, spec, prefix):
configure_opts.extend([ configure_opts.extend([
'--prefix={0}'.format(prefix), '--prefix={0}'.format(prefix),
'--enable-shared={0}'.format('yes' if '+shared' in spec else 'no'), # NOQA: ignore=E501 '--enable-shared={0}'.format('yes' if '+shared' in spec else 'no'),
'--enable-mpi={0}'.format('yes' if '+mpi' in spec else 'no'), '--enable-mpi={0}'.format('yes' if '+mpi' in spec else 'no'),
'--enable-gsl={0}'.format('yes' if '+gsl' in spec else 'no') '--enable-gsl={0}'.format('yes' if '+gsl' in spec else 'no')
]) ])

View File

@ -58,8 +58,10 @@ class PyPillow(Package):
# Spack does not (yet) support these modes of building # Spack does not (yet) support these modes of building
# variant('webp', default=False, description='Provide the WebP format') # variant('webp', default=False, description='Provide the WebP format')
# variant('webpmux', default=False, description='WebP metadata, relies on WebP support') # NOQA: ignore=E501 # variant('webpmux', default=False,
# variant('imagequant', default=False, description='Provide improved color quantization') # NOQA: ignore=E501 # description='WebP metadata, relies on WebP support')
# variant('imagequant', default=False,
# description='Provide improved color quantization')
# Required dependencies # Required dependencies
extends('python') extends('python')

View File

@ -118,7 +118,8 @@ def install(self, spec, prefix):
config_args.append('--with-wide-unicode') config_args.append('--with-wide-unicode')
elif spec.satisfies('@3.3:'): elif spec.satisfies('@3.3:'):
# https://docs.python.org/3.3/whatsnew/3.3.html # https://docs.python.org/3.3/whatsnew/3.3.html
raise ValueError('+ucs4 variant not compatible with Python 3.3 and beyond') # NOQA: ignore=E501 raise ValueError(
'+ucs4 variant not compatible with Python 3.3 and beyond')
if spec.satisfies('@3:'): if spec.satisfies('@3:'):
config_args.append('--without-ensurepip') config_args.append('--without-ensurepip')

View File

@ -57,7 +57,7 @@ def install(self, spec, prefix):
'METISLIB = -L%s -lmetis' % spec['metis'].prefix.lib, 'METISLIB = -L%s -lmetis' % spec['metis'].prefix.lib,
'PARMETISLIB = -L%s -lparmetis' % spec['parmetis'].prefix.lib, 'PARMETISLIB = -L%s -lparmetis' % spec['parmetis'].prefix.lib,
'FLIBS =', 'FLIBS =',
'LIBS = $(DSUPERLULIB) $(BLASLIB) $(PARMETISLIB) $(METISLIB)', # NOQA: ignore=E501 'LIBS = $(DSUPERLULIB) $(BLASLIB) $(PARMETISLIB) $(METISLIB)', # noqa
'ARCH = ar', 'ARCH = ar',
'ARCHFLAGS = cr', 'ARCHFLAGS = cr',
'RANLIB = true', 'RANLIB = true',

View File

@ -35,7 +35,7 @@ class Tar(Package):
version('1.28', '6ea3dbea1f2b0409b234048e021a9fd7') version('1.28', '6ea3dbea1f2b0409b234048e021a9fd7')
# see http://lists.gnu.org/archive/html/bug-tar/2014-08/msg00001.html and # see http://lists.gnu.org/archive/html/bug-tar/2014-08/msg00001.html and
# https://github.com/Homebrew/homebrew-core/commit/aef9a1792de4648d0322b4b04d32287532f046bb # NOQA: ignore=E501 # https://github.com/Homebrew/homebrew-core/commit/aef9a1792de4648d0322b4b04d32287532f046bb
# TODO: when=sys.platform=='darwin' ? # TODO: when=sys.platform=='darwin' ?
patch('gnutar-configure-xattrs.patch', when='@1.28') patch('gnutar-configure-xattrs.patch', when='@1.28')

View File

@ -35,8 +35,10 @@ class Tbb(Package):
homepage = "http://www.threadingbuildingblocks.org/" homepage = "http://www.threadingbuildingblocks.org/"
# Only version-specific URL's work for TBB # Only version-specific URL's work for TBB
version('4.4.4', 'd4cee5e4ca75cab5181834877738619c56afeb71', url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160413oss_src.tgz') # NOQA: ignore=E501 version('4.4.4', 'd4cee5e4ca75cab5181834877738619c56afeb71',
version('4.4.3', '80707e277f69d9b20eeebdd7a5f5331137868ce1', url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160128oss_src_0.tgz') # NOQA: ignore=E501 url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160413oss_src.tgz')
version('4.4.3', '80707e277f69d9b20eeebdd7a5f5331137868ce1',
url='https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb44_20160128oss_src_0.tgz')
def coerce_to_spack(self, tbb_build_subdir): def coerce_to_spack(self, tbb_build_subdir):
for compiler in ["icc", "gcc", "clang"]: for compiler in ["icc", "gcc", "clang"]: