From 7082b0a59af0eb71fcf1c3165da1505197d488e9 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Sun, 10 Aug 2014 18:05:13 -0700
Subject: [PATCH] cc supports Python 2.6
---
lib/spack/env/cc | 6 +++---
lib/spack/spack/test/python_version.py | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 9e71d25caf..266e41cb48 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -1,12 +1,11 @@
#!/usr/bin/env python
import sys
-if not sys.version_info[:2] >= (2,7):
- sys.exit("Spack requires Python 2.7. Version was %s." % sys.version_info)
+if not sys.version_info[:2] >= (2,6):
+ sys.exit("Spack requires Python 2.6. Version was %s." % sys.version_info)
import os
import re
import subprocess
-import argparse
from contextlib import closing
# Import spack parameters through the build environment.
@@ -18,6 +17,7 @@ if not spack_lib:
# Grab a minimal set of spack packages
sys.path.append(spack_lib)
from spack.compilation import *
+from external import argparse
import llnl.util.tty as tty
spack_prefix = get_env_var("SPACK_PREFIX")
diff --git a/lib/spack/spack/test/python_version.py b/lib/spack/spack/test/python_version.py
index f814df3226..04b4eadf34 100644
--- a/lib/spack/spack/test/python_version.py
+++ b/lib/spack/spack/test/python_version.py
@@ -45,6 +45,7 @@ class PythonVersionTest(unittest.TestCase):
def spack_python_files(self):
# first file is the spack script.
yield spack.spack_file
+ yield os.path.join(spack.build_env_path, 'cc')
# Next files are all the source files and package files.
search_paths = [spack.lib_path, spack.var_path]
--
GitLab