From c043275f1b83e54ad00355fdae255aa11a2d03e1 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Wed, 11 May 2016 11:46:41 -0500
Subject: [PATCH] Final flake8 changes
---
lib/spack/spack/hooks/licensing.py | 1 -
lib/spack/spack/package.py | 8 ++-----
.../builtin/packages/allinea-forge/package.py | 8 +++----
.../packages/allinea-reports/package.py | 8 +++----
.../repos/builtin/packages/nag/package.py | 8 +++----
.../repos/builtin/packages/pgi/package.py | 22 +++++++++----------
6 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py
index 99521c8356..31f15cc3e9 100644
--- a/lib/spack/spack/hooks/licensing.py
+++ b/lib/spack/spack/hooks/licensing.py
@@ -134,4 +134,3 @@ def symlink_license(pkg):
os.symlink(target, link_name)
tty.msg("Added local symlink %s to global license file" %
link_name)
-
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 17d92fdf79..8f8eb6db64 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -407,7 +407,6 @@ def global_license_file(self):
return join_path(global_license_dir, self.name,
os.path.basename(self.license_files[0]))
-
@property
def version(self):
if not self.spec.versions.concrete:
@@ -1021,7 +1020,6 @@ def check_paths(path_list, filetype, predicate):
raise InstallError(
"Install failed for %s. Nothing was installed!" % self.name)
-
def do_install_dependencies(self, **kwargs):
# Pass along paths of dependencies here
for dep in self.spec.dependencies.values():
@@ -1349,11 +1347,9 @@ def fetch_remote_versions(self):
def rpath(self):
"""Get the rpath this package links with, as a list of paths."""
rpaths = [self.prefix.lib, self.prefix.lib64]
- rpaths.extend(d.prefix.lib
- for d in self.spec.traverse(root=False)
+ rpaths.extend(d.prefix.lib for d in self.spec.traverse(root=False)
if os.path.isdir(d.prefix.lib))
- rpaths.extend(d.prefix.lib64
- for d in self.spec.traverse(root=False)
+ rpaths.extend(d.prefix.lib64 for d in self.spec.traverse(root=False)
if os.path.isdir(d.prefix.lib64))
return rpaths
diff --git a/var/spack/repos/builtin/packages/allinea-forge/package.py b/var/spack/repos/builtin/packages/allinea-forge/package.py
index fa88b450be..e5bd62dd70 100644
--- a/var/spack/repos/builtin/packages/allinea-forge/package.py
+++ b/var/spack/repos/builtin/packages/allinea-forge/package.py
@@ -13,10 +13,10 @@ class AllineaForge(Package):
# Licensing
license_required = True
- license_comment = '#'
- license_files = ['licences/Licence']
- license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE']
- license_url = 'http://www.allinea.com/user-guide/forge/Installation.html'
+ license_comment = '#'
+ license_files = ['licences/Licence']
+ license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE']
+ license_url = 'http://www.allinea.com/user-guide/forge/Installation.html'
def url_for_version(self, version):
# TODO: add support for other architectures/distributions
diff --git a/var/spack/repos/builtin/packages/allinea-reports/package.py b/var/spack/repos/builtin/packages/allinea-reports/package.py
index 0099e6e64c..7b11e681f5 100644
--- a/var/spack/repos/builtin/packages/allinea-reports/package.py
+++ b/var/spack/repos/builtin/packages/allinea-reports/package.py
@@ -13,10 +13,10 @@ class AllineaReports(Package):
# Licensing
license_required = True
- license_comment = '#'
- license_files = ['licences/Licence']
- license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE']
- license_url = 'http://www.allinea.com/user-guide/reports/Installation.html'
+ license_comment = '#'
+ license_files = ['licences/Licence']
+ license_vars = ['ALLINEA_LICENCE_FILE', 'ALLINEA_LICENSE_FILE']
+ license_url = 'http://www.allinea.com/user-guide/reports/Installation.html'
def url_for_version(self, version):
# TODO: add support for other architectures/distributions
diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py
index df7344d37a..af893d3db0 100644
--- a/var/spack/repos/builtin/packages/nag/package.py
+++ b/var/spack/repos/builtin/packages/nag/package.py
@@ -11,10 +11,10 @@ class Nag(Package):
# Licensing
license_required = True
- license_comment = '!'
- license_files = ['lib/nag.key']
- license_vars = ['NAG_KUSARI_FILE']
- license_url = 'http://www.nag.com/doc/inun/np61/lin-mac/klicence.txt'
+ license_comment = '!'
+ license_files = ['lib/nag.key']
+ license_vars = ['NAG_KUSARI_FILE']
+ license_url = 'http://www.nag.com/doc/inun/np61/lin-mac/klicence.txt'
def url_for_version(self, version):
# TODO: url and checksum are architecture dependent
diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py
index 8a067a43f1..8dc6453469 100644
--- a/var/spack/repos/builtin/packages/pgi/package.py
+++ b/var/spack/repos/builtin/packages/pgi/package.py
@@ -15,29 +15,29 @@ class Pgi(Package):
set up a mirror, see http://software.llnl.gov/spack/mirrors.html"""
homepage = "http://www.pgroup.com/"
- url = "file://%s/pgi-16.3.tar.gz" % os.getcwd()
+ url = "file://%s/pgi-16.3.tar.gz" % os.getcwd()
version('16.3', '618cb7ddbc57d4e4ed1f21a0ab25f427')
variant('network', default=True,
- description="Perform a network install")
+ description="Perform a network install")
variant('single', default=False,
- description="Perform a single system install")
+ description="Perform a single system install")
variant('nvidia', default=False,
- description="Enable installation of optional NVIDIA components")
+ description="Enable installation of optional NVIDIA components")
variant('amd', default=False,
- description="Enable installation of optional AMD components")
+ description="Enable installation of optional AMD components")
variant('java', default=False,
- description="Enable installation of Java Runtime Environment")
+ description="Enable installation of Java Runtime Environment")
variant('mpi', default=False,
- description="Enable installation of Open MPI")
+ description="Enable installation of Open MPI")
# Licensing
license_required = True
- license_comment = '#'
- license_files = ['license.dat']
- license_vars = ['PGROUPD_LICENSE_FILE', 'LM_LICENSE_FILE']
- license_url = 'http://www.pgroup.com/doc/pgiinstall.pdf'
+ license_comment = '#'
+ license_files = ['license.dat']
+ license_vars = ['PGROUPD_LICENSE_FILE', 'LM_LICENSE_FILE']
+ license_url = 'http://www.pgroup.com/doc/pgiinstall.pdf'
def install(self, spec, prefix):
# Enable the silent installation feature
--
GitLab