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

cc supports Python 2.6

Browse Source
This commit is contained in:
Todd Gamblin 2014-08-10 18:05:13 -07:00
parent 696e80c62f
commit 7082b0a59a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/env/cc vendored
View File

@ -1,12 +1,11 @@
#!/usr/bin/env python #!/usr/bin/env python
import sys import sys
if not sys.version_info[:2] >= (2,7): if not sys.version_info[:2] >= (2,6):
sys.exit("Spack requires Python 2.7. Version was %s." % sys.version_info) sys.exit("Spack requires Python 2.6. Version was %s." % sys.version_info)
import os import os
import re import re
import subprocess import subprocess
import argparse
from contextlib import closing from contextlib import closing
# Import spack parameters through the build environment. # Import spack parameters through the build environment.
@ -18,6 +17,7 @@ if not spack_lib:
# Grab a minimal set of spack packages # Grab a minimal set of spack packages
sys.path.append(spack_lib) sys.path.append(spack_lib)
from spack.compilation import * from spack.compilation import *
from external import argparse
import llnl.util.tty as tty import llnl.util.tty as tty
spack_prefix = get_env_var("SPACK_PREFIX") spack_prefix = get_env_var("SPACK_PREFIX")

1
lib/spack/spack/test/python_version.py
View File

@ -45,6 +45,7 @@ class PythonVersionTest(unittest.TestCase):
def spack_python_files(self): def spack_python_files(self):
# first file is the spack script. # first file is the spack script.
yield spack.spack_file yield spack.spack_file
yield os.path.join(spack.build_env_path, 'cc')
# Next files are all the source files and package files. # Next files are all the source files and package files.
search_paths = [spack.lib_path, spack.var_path] search_paths = [spack.lib_path, spack.var_path]