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

Make packages Python3 compatible.

Browse Source
This commit is contained in:
Todd Gamblin 2017-03-25 23:23:47 -07:00
parent 7f3f493024
commit b9ee86cac9
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin.mock/packages/multimethod/package.py
View File

@ -22,6 +22,8 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from six import string_types
from spack import *
import spack.architecture
@ -102,14 +104,14 @@ def has_a_default(self):
# Make sure we can switch methods on different target
#
platform = spack.architecture.platform()
targets = platform.targets.values()
targets = list(platform.targets.values())
if len(targets) > 1:
targets = targets[:-1]
for target in targets:
@when('target=' + target.name)
def different_by_target(self):
if isinstance(self.spec.architecture.target, basestring):
if isinstance(self.spec.architecture.target, string_types):
return self.spec.architecture.target
else:
return self.spec.architecture.target.name

24
var/spack/repos/builtin/packages/hdf5-blosc/package.py
View File

@ -22,7 +22,7 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from __future__ import print_function
import os
import shutil
import sys
@ -115,7 +115,7 @@ def install(self, spec, prefix):
def check_install(self, spec):
"Build and run a small program to test the installed HDF5 Blosc plugin"
print "Checking HDF5-Blosc plugin..."
print("Checking HDF5-Blosc plugin...")
checkdir = "spack-check"
with working_dir(checkdir, create=True):
source = r"""\
@ -188,16 +188,16 @@ def check_install(self, spec):
output = ""
success = output == expected
if not success:
print "Produced output does not match expected output."
print "Expected output:"
print "-" * 80
print expected
print "-" * 80
print "Produced output:"
print "-" * 80
print output
print "-" * 80
print "Environment:"
print("Produced output does not match expected output.")
print("Expected output:")
print("-" * 80)
print(expected)
print("-" * 80)
print("Produced output:")
print("-" * 80)
print(output)
print("-" * 80)
print("Environment:")
env = which("env")
env()
raise RuntimeError("HDF5 Blosc plugin check failed")

2
var/spack/repos/builtin/packages/miniconda2/package.py
View File

@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
from urlparse import urlparse
from six.moves.urllib.parse import urlparse
from os.path import split

2
var/spack/repos/builtin/packages/miniconda3/package.py
View File

@ -23,7 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import *
from urlparse import urlparse
from six.moves.urllib.parse import urlparse
from os.path import split

2
var/spack/repos/builtin/packages/ncl/package.py
View File

@ -229,6 +229,6 @@ def delete_files(*filenames):
if os.path.exists(filename):
try:
os.remove(filename)
except OSError, e:
except OSError as e:
raise InstallError('Failed to delete file %s: %s' % (
e.filename, e.strerror))

2
var/spack/repos/builtin/packages/nwchem/package.py
View File

@ -68,7 +68,7 @@ class Nwchem(Package):
]
}
# Iterate over patches
for condition, urls in urls_for_patches.iteritems():
for condition, urls in urls_for_patches.items():
for url, md5 in urls:
patch(url, when=condition, level=0, md5=md5)