diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2016-08-01 12:37:36 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2016-08-11 10:22:47 -0500 |
| commit | 5fc20487e488c2306b36d83e2188554aebae4b31 (patch) | |
| tree | 32d11b933f2e6bf79255732806dac8b0738cec9a /var | |
| parent | 534e1cbf1b1f11ce37e216e2ebf48d623846120b (diff) | |
| download | spack-5fc20487e488c2306b36d83e2188554aebae4b31.tar.gz spack-5fc20487e488c2306b36d83e2188554aebae4b31.tar.bz2 spack-5fc20487e488c2306b36d83e2188554aebae4b31.tar.xz spack-5fc20487e488c2306b36d83e2188554aebae4b31.zip | |
Flake8 and formatting changes
Diffstat (limited to 'var')
6 files changed, 24 insertions, 20 deletions
diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index da94de8dd7..d8b4eefff4 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -44,7 +44,7 @@ class Cmake(Package): variant('curl', default=True, description='Build external curl library') variant('expat', default=True, description='Build external expat library') - # variant('jsoncpp', default=True, description='Build external jsoncpp library') + # variant('jsoncpp', default=True, description='Build external jsoncpp library') # NOQA: ignore=E501 variant('zlib', default=True, description='Build external zlib library') variant('bzip2', default=True, description='Build external bzip2 library') variant('xz', default=True, description='Build external lzma library') @@ -88,7 +88,7 @@ class Cmake(Package): # Consistency check self.validate(spec) - def variant_to_bool(variant): + def variant_to_bool(variant): return 'system' if variant in spec else 'no-system' # configure, build, install: diff --git a/var/spack/repos/builtin/packages/libarchive/package.py b/var/spack/repos/builtin/packages/libarchive/package.py index 2397075d42..387af47b26 100644 --- a/var/spack/repos/builtin/packages/libarchive/package.py +++ b/var/spack/repos/builtin/packages/libarchive/package.py @@ -77,6 +77,7 @@ class Libarchive(Package): ] configure(*config_args) + make() - # make("check") # cannot build test suite with Intel compilers - make("install") + # make('check') # cannot build test suite with Intel compilers + make('install') diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 214a027805..6b25097bcd 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -45,14 +45,15 @@ class Libxml2(Package): def install(self, spec, prefix): if '+python' in spec: - python_args = ["--with-python=%s" % spec['python'].prefix, - "--with-python-install-dir=%s" % site_packages_dir] + python_args = [ + '--with-python={0}'.format(spec['python'].prefix), + '--with-python-install-dir={0}'.format(site_packages_dir) + ] else: - python_args = ["--without-python"] + python_args = ['--without-python'] - configure("--prefix=%s" % prefix, - *python_args) + configure('--prefix={0}'.format(prefix), *python_args) make() - make("check") - make("install") + make('check') + make('install') diff --git a/var/spack/repos/builtin/packages/nettle/package.py b/var/spack/repos/builtin/packages/nettle/package.py index 52644fa8a4..bf49423605 100644 --- a/var/spack/repos/builtin/packages/nettle/package.py +++ b/var/spack/repos/builtin/packages/nettle/package.py @@ -38,7 +38,8 @@ class Nettle(Package): depends_on('gmp') def install(self, spec, prefix): - configure("--prefix=%s" % prefix) + configure('--prefix={0}'.format(prefix)) + make() - make("check") - make("install") + make('check') + make('install') diff --git a/var/spack/repos/builtin/packages/xz/package.py b/var/spack/repos/builtin/packages/xz/package.py index 5b46e838ed..815d898504 100644 --- a/var/spack/repos/builtin/packages/xz/package.py +++ b/var/spack/repos/builtin/packages/xz/package.py @@ -37,7 +37,8 @@ class Xz(Package): version('5.2.2', 'f90c9a0c8b259aee2234c4e0d7fd70af') def install(self, spec, prefix): - configure("--prefix=%s" % prefix) + configure('--prefix={0}'.format(prefix)) + make() - make("check") - make("install") + make('check') + make('install') diff --git a/var/spack/repos/builtin/packages/zlib/package.py b/var/spack/repos/builtin/packages/zlib/package.py index 7145b78d63..8834a05804 100644 --- a/var/spack/repos/builtin/packages/zlib/package.py +++ b/var/spack/repos/builtin/packages/zlib/package.py @@ -35,8 +35,8 @@ class Zlib(Package): version('1.2.8', '44d667c142d7cda120332623eab69f40') def install(self, spec, prefix): - configure("--prefix=%s" % prefix) + configure('--prefix={0}'.format(prefix)) make() - make("test") - make("install") + make('test') + make('install') |