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

Flake8 and url_for_version fixes

Browse Source
This commit is contained in:
Adam J. Stewart 2016-06-22 15:22:42 -05:00
parent 3f4bf04dde
commit d566510a40
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
var/spack/repos/builtin/packages/hdf5/package.py
View File

@ -70,7 +70,8 @@ def validate(self, spec):
raise RuntimeError(msg) raise RuntimeError(msg)
if '+threadsafe' in spec and ('+cxx' in spec or '+fortran' in spec): if '+threadsafe' in spec and ('+cxx' in spec or '+fortran' in spec):
raise RuntimeError("cannot use variant +threadsafe with either +cxx or +fortran") msg = 'cannot use variant +threadsafe with either +cxx or +fortran'
raise RuntimeError(msg)
def install(self, spec, prefix): def install(self, spec, prefix):
self.validate(spec) self.validate(spec)
@ -185,24 +186,30 @@ def check_install(self, spec):
if not success: if not success:
print "Produced output does not match expected output." print "Produced output does not match expected output."
print "Expected output:" print "Expected output:"
print '-'*80 print '-' * 80
print expected print expected
print '-'*80 print '-' * 80
print "Produced output:" print "Produced output:"
print '-'*80 print '-' * 80
print output print output
print '-'*80 print '-' * 80
raise RuntimeError("HDF5 install check failed") raise RuntimeError("HDF5 install check failed")
shutil.rmtree(checkdir) shutil.rmtree(checkdir)
def url_for_version(self, version): def url_for_version(self, version):
v = str(version) base_url = "http://www.hdfgroup.org/ftp/HDF5/releases"
if version == Version("1.2.2"): if version == Version("1.2.2"):
return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + ".tar.gz" return "{0}/hdf5-{1}.tar.gz".format(base_url, version)
elif version < Version("1.6.6"):
return "{0}/hdf5-{1}/hdf5-{2}.tar.gz".format(
base_url, version.up_to(2), version)
elif version < Version("1.7"): elif version < Version("1.7"):
return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + version.up_to(2) + "/hdf5-" + v + ".tar.gz" return "{0}/hdf5-{1}/hdf5-{2}/src/hdf5-{2}.tar.gz".format(
base_url, version.up_to(2), version)
elif version < Version("1.10"): elif version < Version("1.10"):
return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + v + "/src/hdf5-" + v + ".tar.gz" return "{0}/hdf5-{1}/src/hdf5-{1}.tar.gz".format(
base_url, version)
else: else:
return "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-" + version.up_to(2) + "/hdf5-" + v + "/src/hdf5-" + v + ".tar.gz" return "{0}/hdf5-{1}/hdf5-{2}/src/hdf5-{2}.tar.gz".format(
base_url, version.up_to(2), version)