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

qa : this should still fail due to F821

Browse Source
This commit is contained in:
alalazo 2016-05-10 19:20:26 +02:00
parent 3f20014f33
commit 7d74e209f3
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/spack/spack/architecture.py
View File

@ -34,15 +34,14 @@
class InvalidSysTypeError(serr.SpackError): class InvalidSysTypeError(serr.SpackError):
def __init__(self, sys_type): def __init__(self, sys_type):
super(InvalidSysTypeError, self).__init__( super(InvalidSysTypeError,
"Invalid sys_type value for Spack: " + sys_type) self).__init__("Invalid sys_type value for Spack: " + sys_type)
class NoSysTypeError(serr.SpackError): class NoSysTypeError(serr.SpackError):
def __init__(self): def __init__(self):
super(NoSysTypeError, self).__init__( super(NoSysTypeError,
"Could not determine sys_type for this machine.") self).__init__("Could not determine sys_type for this machine.")
def get_sys_type_from_spack_globals(): def get_sys_type_from_spack_globals():
@ -70,15 +69,15 @@ def get_sys_type_from_platform():
@memoized @memoized
def sys_type(): def sys_type():
"""Returns a SysType for the current machine.""" """Returns a SysType for the current machine."""
methods = [get_sys_type_from_spack_globals, methods = [get_sys_type_from_spack_globals, get_sys_type_from_environment,
get_sys_type_from_environment,
get_sys_type_from_platform] get_sys_type_from_platform]
# search for a method that doesn't return None # search for a method that doesn't return None
sys_type = None sys_type = None
for method in methods: for method in methods:
sys_type = method() sys_type = method()
if sys_type: break if sys_type:
break
# Couldn't determine the sys_type for this machine. # Couldn't determine the sys_type for this machine.
if sys_type is None: if sys_type is None:

10
var/spack/repos/builtin/packages/ImageMagick/package.py
View File

@ -1,5 +1,6 @@
from spack import * from spack import *
class Imagemagick(Package): class Imagemagick(Package):
"""ImageMagick is a image processing library""" """ImageMagick is a image processing library"""
homepage = "http://www.imagemagic.org" homepage = "http://www.imagemagic.org"
@ -20,10 +21,10 @@ class Imagemagick(Package):
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# *-10 versions are archived, so these versions should fetch reliably. # *-10 versions are archived, so these versions should fetch reliably.
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
version('6.8.9-10', 'aa050bf9785e571c956c111377bbf57c', version(
url="http://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.8/ImageMagick-6.8.9-10.tar.gz/download") '6.8.9-10',
'aa050bf9785e571c956c111377bbf57c',
url="http://sourceforge.net/projects/imagemagick/files/old-sources/6.x/6.8/ImageMagick-6.8.9-10.tar.gz/download") # NOQA: ignore=E501
depends_on('jpeg') depends_on('jpeg')
depends_on('libtool') depends_on('libtool')
@ -34,6 +35,5 @@ class Imagemagick(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
configure("--prefix=%s" % prefix) configure("--prefix=%s" % prefix)
make() make()
make("install") make("install")

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

@ -1,5 +1,6 @@
from spack import * from spack import *
class Mitos(Package): class Mitos(Package):
"""Mitos is a library and a tool for collecting sampled memory """Mitos is a library and a tool for collecting sampled memory
performance data to view with MemAxes""" performance data to view with MemAxes"""
@ -11,16 +12,12 @@ class Mitos(Package):
git='https://github.com/llnl/Mitos.git', git='https://github.com/llnl/Mitos.git',
commit='8cb143a2e8c00353ff531a781a9ca0992b0aaa3d') commit='8cb143a2e8c00353ff531a781a9ca0992b0aaa3d')
version('0.9.1', version('0.9.1', git='https://github.com/llnl/Mitos.git', tag='v0.9.1')
git='https://github.com/llnl/Mitos.git',
tag='v0.9.1')
depends_on('dyninst@8.2.1:') depends_on('dyninst@8.2.1:')
depends_on('hwloc') depends_on('hwloc')
depends_on('mpi') depends_on('mpi')
def install(self, spec, prefix): def install(self, spec, prefix):
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):
cmake('..', *std_cmake_args) cmake('..', *std_cmake_args)