Flake8 formatting changes

5 files changed, 28 insertions, 21 deletions

diff --git a/lib/spack/spack/hooks/licensing.py b/lib/spack/spack/hooks/licensing.py
index 56f7b6daa5..99521c8356 100644
--- a/lib/spack/spack/hooks/licensing.py
+++ b/lib/spack/spack/hooks/licensing.py
@@ -46,7 +46,7 @@ def set_up_license(pkg):
     # If not a file or variable, suggest a website for further info
     elif pkg.license_url:
         tty.warn("A license is required to use %s. See %s for details" %
-                (pkg.name, pkg.license_url))
+                 (pkg.name, pkg.license_url))
 
     # If all else fails, you're on your own
     else:
@@ -132,4 +132,6 @@ def symlink_license(pkg):
         link_name = join_path(pkg.prefix, filename)
         if os.path.exists(target):
             os.symlink(target, link_name)
-            tty.msg("Added local symlink %s to global license file" % link_name)
+            tty.msg("Added local symlink %s to global license file" %
+                    link_name)
+
diff --git a/var/spack/repos/builtin/packages/allinea-forge/package.py b/var/spack/repos/builtin/packages/allinea-forge/package.py
index 1f757039a6..fa88b450be 100644
--- a/var/spack/repos/builtin/packages/allinea-forge/package.py
+++ b/var/spack/repos/builtin/packages/allinea-forge/package.py
@@ -1,5 +1,6 @@
 from spack import *
 
+
 class AllineaForge(Package):
     """Allinea Forge is the complete toolsuite for software development - with
     everything needed to debug, profile, optimize, edit and build C, C++ and
@@ -17,13 +18,11 @@ class AllineaForge(Package):
     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
         url = "http://content.allinea.com/downloads/"
         return url + "allinea-forge-%s-Redhat-6.0-x86_64.tar" % version
 
-
     def install(self, spec, prefix):
         textinstall = which('textinstall.sh')
         textinstall('--accept-licence', prefix)
diff --git a/var/spack/repos/builtin/packages/allinea-reports/package.py b/var/spack/repos/builtin/packages/allinea-reports/package.py
index 526d51c688..0099e6e64c 100644
--- a/var/spack/repos/builtin/packages/allinea-reports/package.py
+++ b/var/spack/repos/builtin/packages/allinea-reports/package.py
@@ -1,9 +1,11 @@
 from spack import *
 
+
 class AllineaReports(Package):
     """Allinea Performance Reports are the most effective way to characterize
-    and understand the performance of HPC application runs. One single-page HTML
-    report elegantly answers a range of vital questions for any HPC site"""
+    and understand the performance of HPC application runs. One single-page
+    HTML report elegantly answers a range of vital questions for any HPC site
+    """
 
     homepage = "http://www.allinea.com/products/allinea-performance-reports"
 
@@ -16,13 +18,11 @@ class AllineaReports(Package):
     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
         url = "http://content.allinea.com/downloads/"
         return url + "allinea-reports-%s-Redhat-6.0-x86_64.tar" % version
 
-
     def install(self, spec, prefix):
         textinstall = which('textinstall.sh')
         textinstall('--accept-licence', prefix)
diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py
index d6ffe35171..df7344d37a 100644
--- a/var/spack/repos/builtin/packages/nag/package.py
+++ b/var/spack/repos/builtin/packages/nag/package.py
@@ -1,6 +1,7 @@
 from spack import *
 import os
 
+
 class Nag(Package):
     """The NAG Fortran Compiler."""
     homepage = "http://www.nag.com/nagware/np.asp"
@@ -15,13 +16,11 @@ class Nag(Package):
     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
         # TODO: We currently only support x86_64
         return 'http://www.nag.com/downloads/impl/npl6a%sna_amd64.tgz' % \
-                str(version).replace('.', '')
-
+               str(version).replace('.', '')
 
     def install(self, spec, prefix):
         # Set installation directories
diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py
index 095569a2a9..8a067a43f1 100644
--- a/var/spack/repos/builtin/packages/pgi/package.py
+++ b/var/spack/repos/builtin/packages/pgi/package.py
@@ -1,6 +1,7 @@
 from spack import *
 import os
 
+
 class Pgi(Package):
     """PGI optimizing multi-core x64 compilers for Linux, MacOS & Windows
     with support for debugging and profiling of local MPI processes.
@@ -18,12 +19,18 @@ class Pgi(Package):
 
     version('16.3', '618cb7ddbc57d4e4ed1f21a0ab25f427')
 
-    variant('network', default=True,  description="Perform a network install")
-    variant('single',  default=False, description="Perform a single system install")
-    variant('nvidia',  default=False, description="Enable installation of optional NVIDIA components, such as CUDA")
-    variant('amd',     default=False, description="Enable installation of optional AMD components")
-    variant('java',    default=False, description="Enable installation of Java Runtime Environment")
-    variant('mpi',     default=False, description="Enable installation of Open MPI")
+    variant('network', default=True,
+        description="Perform a network install")
+    variant('single',  default=False,
+        description="Perform a single system install")
+    variant('nvidia',  default=False,
+        description="Enable installation of optional NVIDIA components")
+    variant('amd',     default=False,
+        description="Enable installation of optional AMD components")
+    variant('java',    default=False,
+        description="Enable installation of Java Runtime Environment")
+    variant('mpi',     default=False,
+        description="Enable installation of Open MPI")
 
     # Licensing
     license_required = True
@@ -32,7 +39,6 @@ class Pgi(Package):
     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
         os.environ['PGI_SILENT'] = "true"
@@ -41,12 +47,13 @@ class Pgi(Package):
 
         if '+network' in spec and '~single' in spec:
             os.environ['PGI_INSTALL_TYPE'] = "network"
-            os.environ['PGI_INSTALL_LOCAL_DIR'] = "%s/%s/share_objects" % (prefix, self.version)
+            os.environ['PGI_INSTALL_LOCAL_DIR'] = "%s/%s/share_objects" % \
+                (prefix, self.version)
         elif '+single' in spec and '~network' in spec:
             os.environ['PGI_INSTALL_TYPE'] = "single"
         else:
-            msg  = 'You must choose either a network install or a single system install.\n'
-            msg += 'You cannot choose both.'
+            msg  = 'You must choose either a network install or a single '
+            msg += 'system install.\nYou cannot choose both.'
             raise RuntimeError(msg)
 
         if '+nvidia' in spec: