zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flake8: make entire repository pass spack flake8 -a

Browse Source 
- Fix trailing whitespace missed by the bug described in #12755.

- Fix other style issues that have crept in over time (this can happen
  when flake8 adds new checks with new versions)
This commit is contained in:
Todd Gamblin 2019-09-07 19:27:51 -07:00
parent 0ec80e8f16
commit a2220f3150
69 changed files with 346 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/main.py
View File

@ -247,8 +247,8 @@ def add_subcommand_group(title, commands):
spack help --all list all commands and options
spack help <command> help on a specific command
spack help --spec help on the package specification syntax
spack docs open http://spack.rtfd.io/ in a browser"""
.format(help=section_descriptions['help']))
spack docs open http://spack.rtfd.io/ in a browser
""".format(help=section_descriptions['help']))
# determine help from format above
return formatter.format_help()

3
lib/spack/spack/schema/env.py
View File

@ -87,7 +87,8 @@
'anyOf': [
{'type': 'boolean'},
{'type': 'string'},
{'type': 'object',
{
'type': 'object',
'patternProperties': {
r'\w+': {
'required': ['root'],

3
lib/spack/spack/schema/spec_set.py
View File

@ -83,7 +83,8 @@
'cdash': {
'oneOf': [
{'type': 'string'},
{'type': 'array',
{
'type': 'array',
'items': {'type': 'string'}
},
],

1
lib/spack/spack/test/pattern.py
View File

@ -27,7 +27,6 @@ def subtract(self):
def implementation(interface):
"""Returns an implementation of the interface"""
class Implementation(interface):
def __init__(self, value):
self.value = value

2
lib/spack/spack/test/variant.py
View File

@ -714,7 +714,7 @@ def test_disjoint_set_initialization():
# Test that no error is thrown when the sets are disjoint
d = disjoint_sets(('a',), ('b', 'c'), ('e', 'f'))
assert d.default is 'none'
assert d.default == 'none'
assert d.multi is True
assert set(x for x in d) == set(['none', 'a', 'b', 'c', 'e', 'f'])

4
var/spack/repos/builtin.mock/packages/cmake-client/package.py
View File

@ -25,7 +25,7 @@ class CmakeClient(CMakePackage):
flipped = False
run_this = True
check_this_is_None = None
check_this_is_none = None
did_something = False
@run_after('cmake')
@ -34,7 +34,7 @@ def increment(self):
self.callback_counter += 1
@run_after('cmake')
@on_package_attributes(run_this=True, check_this_is_None=None)
@on_package_attributes(run_this=True, check_this_is_none=None)
def flip(self):
self.flipped = True

71
var/spack/repos/builtin/packages/athena/package.py
View File

@ -21,17 +21,60 @@ class Athena(AutotoolsPackage):
# PHYSICS "packages":
variant('problem', default='linear_wave', description='Problem generator',
values=[
'blast', 'carbuncle', 'collapse3d', 'cpaw', 'cshock1d',
'current_sheet', 'cyladvect', 'cylblast', 'cylbphi', 'cylbr',
'cylcvmri', 'cyldiff', 'cylfieldloop', 'cylnewtmri', 'cylrayleigh',
'cylspiral', 'cylwind', 'cylwindrot', 'cylwindrotb', 'dmr', 'fft_test',
'field_loop', 'firehose', 'hall_drift', 'hb3', 'hgb', 'hkdisk',
'jeans', 'jet', 'kh', 'linear_wave', 'lw_implode', 'msa', 'noh',
'orszag-tang', 'par_collision', 'par_epicycle', 'par_strat2d',
'par_strat3d', 'pgflow', 'rotor', 'rt', 'shk_cloud', 'shkset1d',
'shkset2d', 'shkset3d', 'shu-osher', 'strat', 'streaming2d_multi',
'streaming2d_single', 'streaming3d_multi', 'streaming3d_single',
'twoibw'])
'blast',
'carbuncle',
'collapse3d',
'cpaw',
'cshock1d',
'current_sheet',
'cyladvect',
'cylblast',
'cylbphi',
'cylbr',
'cylcvmri',
'cyldiff',
'cylfieldloop',
'cylnewtmri',
'cylrayleigh',
'cylspiral',
'cylwind',
'cylwindrot',
'cylwindrotb',
'dmr',
'fft_test',
'field_loop',
'firehose',
'hall_drift',
'hb3',
'hgb',
'hkdisk',
'jeans',
'jet',
'kh',
'linear_wave',
'lw_implode',
'msa',
'noh',
'orszag-tang',
'par_collision',
'par_epicycle',
'par_strat2d',
'par_strat3d',
'pgflow',
'rotor',
'rt',
'shk_cloud',
'shkset1d',
'shkset2d',
'shkset3d',
'shu-osher',
'strat',
'streaming2d_multi',
'streaming2d_single',
'streaming3d_multi',
'streaming3d_single',
'twoibw'
])
variant('gas', default='mhd', description='Gas properties',
values=['mhd', 'hydro'])
variant('eos', default='adiabatic', description='Equation of state',
@ -55,9 +98,9 @@ class Athena(AutotoolsPackage):
variant('order', default='2',
description='Order and type of spatial reconstruction',
values=['1', '2', '3', '2p', '3p'])
variant('flux', default='roe', description='Flux function',
values=['roe', 'hllc', 'hlld', 'hlle', 'force', 'exact',
'two-shock'])
variant('flux', default='roe', description='Flux function', values=[
'roe', 'hllc', 'hlld', 'hlle', 'force', 'exact', 'two-shock'
])
variant('integrator', default='ctu',
description='Unsplit integration algorithm',
values=['ctu', 'vl'])

8
var/spack/repos/builtin/packages/atlas/package.py
View File

@ -44,11 +44,9 @@ class Atlas(Package):
multi=False
)
variant('tune_cpu', default=-1,
multi=False,
description="Number of threads to tune to,\
-1 for autodetect, 0 for no threading"
)
variant('tune_cpu', default=-1, multi=False,
description="Number of threads to tune to, "
"-1 for autodetect, 0 for no threading")
provides('blas')
provides('lapack')

8
var/spack/repos/builtin/packages/boxlib/package.py
View File

@ -17,12 +17,8 @@ class Boxlib(CMakePackage):
depends_on('mpi')
variant('dims',
default='3',
values=('1', '2', '3'),
multi=False,
description='Number of spatial dimensions'
)
variant('dims', default='3', values=('1', '2', '3'), multi=False,
description='Number of spatial dimensions')
def cmake_args(self):
spec = self.spec

12
var/spack/repos/builtin/packages/ccs-qcd/package.py
View File

@ -33,14 +33,12 @@ class CcsQcd(MakefilePackage):
version('master', branch='master')
version('1.2.1', commit='d7c6b6923f35a824e997ba8db5bd12dc20dda45c')
variant(
'class', values=int, default=1,
description='This miniapp has five problem classes, for which the' +
' first three are relatively small problems just for testing' +
' this miniapp itself. The remaining two are the target problem' +
variant('class', values=int, default=1,
description='This miniapp has five problem classes, for which the'
' first three are relatively small problems just for testing'
' this miniapp itself. The remaining two are the target problem'
' sizes for the HPCI FS evaluation.',
multi=False, validator=class_validator
)
multi=False, validator=class_validator)
depends_on('mpi')

8
var/spack/repos/builtin/packages/chombo/package.py
View File

@ -24,12 +24,8 @@ class Chombo(MakefilePackage):
variant('mpi', default=True, description='Enable MPI parallel support')
variant('hdf5', default=True, description='Enable HDF5 support')
variant('dims',
default='3',
values=('1', '2', '3', '4', '5', '6'),
multi=False,
description='Number of PDE dimensions [1-6]'
)
variant('dims', default='3', values=('1', '2', '3', '4', '5', '6'),
multi=False, description='Number of PDE dimensions [1-6]')
patch('hdf5-16api.patch', when='@3.2', level=0)
patch('Make.defs.local.template.patch', when='@3.2', level=0)

6
var/spack/repos/builtin/packages/font-util/package.py
View File

@ -77,13 +77,11 @@ class FontUtil(AutotoolsPackage):
md5=f_r[2], destination=f, when='fonts=' + f)
fonts.append(f)
variant(
'fonts',
variant('fonts',
description='Installs fonts',
values=fonts,
default=','.join(fonts),
multi=True
)
multi=True)
def setup_environment(self, spack_env, run_env):
spack_env.prepend_path('PATH', self.prefix.bin)

4
var/spack/repos/builtin/packages/gapfiller/package.py
View File

@ -24,7 +24,9 @@ class Gapfiller(Package):
def url_for_version(self, version):
return "file://{0}/39GapFiller_v{1}_linux-x86_64.tar.gz".format(
os.getcwd(), version.dashed)
os.getcwd(),
version.dashed
)
depends_on('perl+threads', type=('build', 'run'))

6
var/spack/repos/builtin/packages/gcc/package.py
View File

@ -115,12 +115,10 @@ class Gcc(AutotoolsPackage):
# nvptx-tools does not seem to work as a dependency,
# but does fine when the source is inside the gcc build directory
# nvptx-tools doesn't have any releases, so grabbing the last commit
resource(
name='nvptx-tools',
resource(name='nvptx-tools',
git='https://github.com/MentorEmbedded/nvptx-tools',
commit='5f6f343a302d620b0868edab376c00b15741e39e',
when='+nvptx'
)
when='+nvptx')
# TODO: integrate these libraries.
# depends_on('ppl')

7
var/spack/repos/builtin/packages/gdl/package.py
View File

@ -19,11 +19,10 @@ class Gdl(CMakePackage):
version('0.9.9', sha256='ad5de3fec095a5c58b46338dcc7367d2565c093794ab1bbcf180bba1a712cf14')
version('0.9.8', '447b0362e1df5ea8af814a969e89d3ec')
variant(
'graphicsmagick',
variant('graphicsmagick',
default=False,
description='Enable GraphicsMagick'
)
description='Enable GraphicsMagick')
variant('hdf4', default=False, description='Enable HDF4')
variant('hdf5', default=True, description='Enable HDF5')
variant('openmp', default=True, description='Enable OpenMP')

2
var/spack/repos/builtin/packages/gromacs/package.py
View File

@ -61,7 +61,7 @@ class Gromacs(CMakePackage):
'ARM_NEON', 'ARM_NEON_ASIMD'))
variant('rdtscp', default=True, description='Enable RDTSCP instruction usage')
variant('mdrun_only', default=False,
description='Enables the build of a cut-down version' +
description='Enables the build of a cut-down version'
' of libgromacs and/or the mdrun program')
variant('openmp', default=True, description='Enables OpenMP at configure time')
variant('double_precision', default=False, description='Enables a double-precision configuration')

10
var/spack/repos/builtin/packages/intel-xed/package.py
View File

@ -20,16 +20,12 @@ class IntelXed(Package):
# the mbuild resource. Xed doesn't have official releases, only
# git commits.
version_list = [
('2019.03.01',
version_list = [('2019.03.01',
'b7231de4c808db821d64f4018d15412640c34113',
'176544e1fb54b6bfb40f596111368981d287e951',
),
'176544e1fb54b6bfb40f596111368981d287e951'),
('2018.02.14',
'44d06033b69aef2c20ab01bfb518c52cd71bb537',
'bb9123152a330c7fa1ff1a502950dc199c83e177',
)
]
'bb9123152a330c7fa1ff1a502950dc199c83e177')]
version('develop', branch='master')
resource(name='mbuild',

2
var/spack/repos/builtin/packages/lbann/package.py
View File

@ -42,7 +42,7 @@ class Lbann(CMakePackage):
values=('Debug', 'Release'))
variant('al', default=True, description='Builds with support for Aluminum Library')
variant('conduit', default=True,
description='Builds with support for Conduit Library ' +
description='Builds with support for Conduit Library '
'(note that for v0.99 conduit is required)')
variant('vtune', default=False, description='Builds with support for Intel VTune')
variant('docs', default=False, description='Builds with support for building documentation')

6
var/spack/repos/builtin/packages/libfabric/package.py
View File

@ -40,13 +40,11 @@ class Libfabric(AutotoolsPackage):
'tcp',
'efa')
variant(
'fabrics',
variant('fabrics',
default='sockets',
description='A list of enabled fabrics',
values=fabrics,
multi=True
)
multi=True)
# NOTE: the 'kdreg' variant enables use of the special /dev/kdreg file to
# assist in memory registration caching in the GNI provider. This

3
var/spack/repos/builtin/packages/mofem-cephas/package.py
View File

@ -30,7 +30,8 @@ class MofemCephas(CMakePackage):
# This option can be only used for development of core lib
variant('copy_user_modules', default=True,
description='Copy user modules directory instead linking to source')
description='Copy user modules directory '
'instead of linking to source')
variant('adol-c', default=True, description='Compile with ADOL-C')
variant('tetgen', default=True, description='Compile with Tetgen')
variant('med', default=True, description='Compile with Med')

18
var/spack/repos/builtin/packages/nextflow/package.py
View File

@ -12,18 +12,12 @@ class Nextflow(Package):
homepage = "http://www.nextflow.io"
url = "https://github.com/nextflow-io/nextflow/releases/download/v0.24.1/nextflow"
version('0.25.6', '29d739b6caf8ceb5aa9997310ee8d0e7',
expand=False)
version('0.24.1', '80ec8c4fe8e766e0bdd1371a50410d1d',
expand=False)
version('0.23.3', '71fb69275b6788af1c6f1165f40d362e',
expand=False)
version('0.21.0', '38e5e335cb33f05ba358e1f883c8386c',
expand=False)
version('0.20.1', '0e4e0e3eca1c2c97f9b4bffd944b923a',
expand=False)
version('0.17.3', '5df00105fb1ce6fd0ba019ae735d9617',
expand=False)
version('0.25.6', '29d739b6caf8ceb5aa9997310ee8d0e7', expand=False)
version('0.24.1', '80ec8c4fe8e766e0bdd1371a50410d1d', expand=False)
version('0.23.3', '71fb69275b6788af1c6f1165f40d362e', expand=False)
version('0.21.0', '38e5e335cb33f05ba358e1f883c8386c', expand=False)
version('0.20.1', '0e4e0e3eca1c2c97f9b4bffd944b923a', expand=False)
version('0.17.3', '5df00105fb1ce6fd0ba019ae735d9617', expand=False)
depends_on('java')

3
var/spack/repos/builtin/packages/openspeedshop/package.py
View File

@ -44,8 +44,7 @@ class Openspeedshop(CMakePackage):
description="build with cuda packages included.")
variant('gui', default='qt3', values=('none', 'qt3', 'qt4'),
description='Build or not build a GUI of choice'
)
description='Build or not build a GUI of choice')
variant('build_type', default='None', values=('None'),
description='CMake build type')

6
var/spack/repos/builtin/packages/picsar/package.py
View File

@ -43,9 +43,9 @@ def build_targets(self):
if self.spec.satisfies(key):
comp = value
targets.append('COMP={0}'.format(comp))
if comp is 'user':
targets.append('FARGS={0}{1}'.format('-g -O3 ',
self.compiler.openmp_flag))
if comp == 'user':
targets.append(
'FARGS={0}{1}'.format('-g -O3 ', self.compiler.openmp_flag))
if '+prod' in self.spec:
mode = 'prod'

6
var/spack/repos/builtin/packages/picsarlite/package.py
View File

@ -44,9 +44,9 @@ def build_targets(self):
if self.spec.satisfies(key):
comp = value
targets.append('COMP={0}'.format(comp))
if comp is 'user':
targets.append('FARGS={0}{1}'.format('-g -O3 ',
self.compiler.openmp_flag))
if comp == 'user':
targets.append(
'FARGS={0}{1}'.format('-g -O3 ', self.compiler.openmp_flag))
if '+prod' in self.spec:
mode = 'prod'

4
var/spack/repos/builtin/packages/pumi/package.py
View File

@ -39,8 +39,8 @@ class Pumi(CMakePackage):
variant('simmodsuite', default='none',
values=('none', 'base', 'kernels', 'full'),
description="Enable Simmetrix SimModSuite Support: 'base' enables "
"the minimum set of functionality, 'kernels' adds CAD kernel support "
"to 'base', and 'full' enables all functionality.")
"the minimum set of functionality, 'kernels' adds CAD kernel "
"support to 'base', and 'full' enables all functionality.")
depends_on('mpi')
depends_on('cmake@3:', type='build')

2
var/spack/repos/builtin/packages/py-cvxopt/package.py
View File

@ -20,7 +20,7 @@ class PyCvxopt(PythonPackage):
variant('gsl', default=False, description='Use GSL random number generators for constructing random matrices')
variant('fftw', default=False, description='Install the cvxopt.fftw interface to FFTW')
variant('glpk', default=False, description='Enable support for the linear programming solver GLPK')
# variant('mosek', default=False, description='Enable support for the linear, second-order cone, and quadratic programming solvers in MOSEK') # noqa: flake8
# variant('mosek', default=False, description='Enable support for the linear, second-order cone, and quadratic programming solvers in MOSEK') # noqa
variant('dsdp', default=False, description='Enable support for the semidefinite programming solver DSDP')
# Required dependencies

18
var/spack/repos/builtin/packages/pythia6/package.py
View File

@ -108,17 +108,14 @@ class Pythia6(CMakePackage):
sha256=checksum,
expand=False,
destination='example',
placement={example: example}
)
placement={example: example})
# Docs.
docs \
= {'http://www.hepforge.org/archive/pythiasix/update_notes-6.4.28.txt':
'a229be4ba9a4eb65a9d53600a5f388b620038d56694c6cb4671c2be224b67751',
'http://home.thep.lu.se/~torbjorn/pythia6/lutp0613man2.pdf':
'03d637310ea80f0d7aea761492bd38452c602890d8cf913a1ec9edacd79fa43d',
'https://pythiasix.hepforge.org/pythia6-announcement.txt':
'2a52def41f0c93e32e0db58dbcf072b987ebfbd32e42ccfc1f9382fcf65f1271'}
docs = {
'http://www.hepforge.org/archive/pythiasix/update_notes-6.4.28.txt': 'a229be4ba9a4eb65a9d53600a5f388b620038d56694c6cb4671c2be224b67751',
'http://home.thep.lu.se/~torbjorn/pythia6/lutp0613man2.pdf': '03d637310ea80f0d7aea761492bd38452c602890d8cf913a1ec9edacd79fa43d',
'https://pythiasix.hepforge.org/pythia6-announcement.txt': '2a52def41f0c93e32e0db58dbcf072b987ebfbd32e42ccfc1f9382fcf65f1271'
}
for docurl, checksum in iteritems(docs):
doc = os.path.basename(urlparse(docurl).path)
@ -127,8 +124,7 @@ class Pythia6(CMakePackage):
sha256=checksum,
expand=False,
destination='doc',
placement={doc: doc}
)
placement={doc: doc})
# The included patch customizes some routines provided in dummy form
# by the original source to be useful out of the box in the vast

26
var/spack/repos/builtin/packages/qmcpack/package.py
View File

@ -62,22 +62,18 @@ class Qmcpack(CMakePackage, CudaPackage):
conflicts(
'+phdf5',
when='~mpi',
msg='Parallel collective I/O requires MPI-enabled QMCPACK. ' \
'Please add "~phdf5" to the Spack install line for serial QMCPACK.'
)
conflicts(
'+soa',
msg='Parallel collective I/O requires MPI-enabled QMCPACK. '
'Please add "~phdf5" to the Spack install line for serial QMCPACK.')
conflicts('+soa',
when='+cuda',
msg='QMCPACK SOA variant does not exist for CUDA'
)
conflicts(
'^openblas+ilp64',
msg='QMCPACK does not support OpenBLAS 64-bit integer variant'
)
conflicts(
'^intel-mkl+ilp64',
msg='QMCPACK does not support MKL 64-bit integer variant'
)
msg='QMCPACK SOA variant does not exist for CUDA')
conflicts('^openblas+ilp64',
msg='QMCPACK does not support OpenBLAS 64-bit integer variant')
conflicts('^intel-mkl+ilp64',
msg='QMCPACK does not support MKL 64-bit integer variant')
# QMCPACK 3.6.0 or later requires support for C++14
compiler_warning = 'QMCPACK 3.6.0 or later requires a ' \

3
var/spack/repos/builtin/packages/regcm/package.py
View File

@ -37,10 +37,9 @@ class Regcm(AutotoolsPackage):
# See also discussions: #974, #9934, #10797.
extensions = ('knl', 'skl', 'bdw', 'nhl')
variant('extension', values=any_combination_of(*extensions),
description=('Build extensions for a specific architecture. Only '
description='Build extensions for a specific architecture. Only '
'available for GCC and Intel compilers; moreover, '
'GCC builds only one architecture optimization.')
)
variant('pnetcdf', default=False,
description='Build NetCDF using the high performance parallel '

3
var/spack/repos/builtin/packages/unuran/package.py
View File

@ -18,7 +18,8 @@ class Unuran(AutotoolsPackage):
description="Enable the build of shared libraries")
variant('rngstreams', default=True,
description="Use RNGSTREAM library for uniform random generation")
variant('gsl', default=False,
variant(
'gsl', default=False,
description="Use random number generators from GNU Scientific Library")
depends_on('gsl', when="+gsl")

2
var/spack/repos/builtin/packages/zfp/package.py
View File

@ -24,7 +24,7 @@ class Zfp(MakefilePackage):
default='64',
values=('8', '16', '32', '64'),
multi=False,
description='Bit stream word size: use smaller for finer ' \
description='Bit stream word size: use smaller for finer '
'rate granularity. Use 8 for H5Z-ZFP filter.')
variant('shared', default=True,