Merge branch 'develop' of github.com:scalability-llnl/spack into develop

5 files changed, 70 insertions, 3 deletions

diff --git a/lib/spack/spack/test/python_version.py b/lib/spack/spack/test/python_version.py
index 06d87e11ad..5b803b4cf3 100644
--- a/lib/spack/spack/test/python_version.py
+++ b/lib/spack/spack/test/python_version.py
@@ -56,11 +56,16 @@ class PythonVersionTest(unittest.TestCase):
                         yield os.path.join(root, filename)
 
 
-    def test_python_versions(self):
+    def all_package_py_files(self):
+        for name in spack.db.all_package_names():
+            yield spack.db.filename_for_package_name(name)
+
+
+    def check_python_versions(self, files):
         # dict version -> filename -> reasons
         all_issues = {}
 
-        for fn in self.spack_python_files():
+        for fn in files:
             with open(fn) as pyfile:
                 versions = pyqver2.get_versions(pyfile.read())
                 for ver, reasons in versions.items():
@@ -93,3 +98,11 @@ class PythonVersionTest(unittest.TestCase):
                 print fmt % msg
 
         self.assertTrue(len(all_issues) == 0)
+
+
+    def test_core_module_compatibility(self):
+        self.check_python_versions(self.spack_python_files())
+
+
+    def test_package_module_compatibility(self):
+        self.check_python_versions(self.all_package_py_files())
diff --git a/var/spack/packages/exuberant-ctags/package.py b/var/spack/packages/exuberant-ctags/package.py
new file mode 100644
index 0000000000..efd2b541b2
--- /dev/null
+++ b/var/spack/packages/exuberant-ctags/package.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class ExuberantCtags(Package):
+    """The canonical ctags generator"""
+    homepage = "ctags.sourceforge.net"
+    url      = "http://downloads.sourceforge.net/project/ctags/ctags/5.8/ctags-5.8.tar.gz"
+
+    version('5.8', 'c00f82ecdcc357434731913e5b48630d')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/global/package.py b/var/spack/packages/global/package.py
new file mode 100644
index 0000000000..a77b1bdc09
--- /dev/null
+++ b/var/spack/packages/global/package.py
@@ -0,0 +1,24 @@
+from spack import *
+import os
+
+
+class Global(Package):
+    """ The Gnu Global tagging system """
+    # FIXME: add a proper url for your package's homepage here.
+    homepage = "http://www.gnu.org/software/global"
+    url = "http://tamacom.com/global/global-6.5.tar.gz"
+
+    version('6.5', 'dfec818b4f53d91721e247cf7b218078')
+
+    depends_on('exuberant-ctags')
+
+    def install(self, spec, prefix):
+        config_args = ['--prefix={}'.format(prefix)]
+
+        config_args.append('--with-exuberant-ctags={}'.format(
+            os.path.join(spec['exuberant-ctags'].prefix.bin, 'ctags')))
+
+        configure(*config_args)
+
+        make()
+        make("install")
diff --git a/var/spack/packages/py-yapf/package.py b/var/spack/packages/py-yapf/package.py
new file mode 100644
index 0000000000..12ef191515
--- /dev/null
+++ b/var/spack/packages/py-yapf/package.py
@@ -0,0 +1,15 @@
+from spack import *
+
+class PyYapf(Package):
+    """ Yet Another Python Formatter """
+    homepage = "https://github.com/google/yapf"
+    # base https://pypi.python.org/pypi/cffi
+    url      = "https://github.com/google/yapf/archive/v0.2.1.tar.gz"
+
+    version('0.2.1', '348ccf86cf2057872e4451b204fb914c')
+
+    extends('python')
+    depends_on('py-setuptools')
+
+    def install(self, spec, prefix):
+        python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/packages/vim/package.py b/var/spack/packages/vim/package.py
index 0ac064d8dc..f60e476a50 100644
--- a/var/spack/packages/vim/package.py
+++ b/var/spack/packages/vim/package.py
@@ -27,7 +27,8 @@ class Vim(Package):
 
     feature_sets = ('huge', 'big', 'normal', 'small', 'tiny')
     for fs in feature_sets:
-      variant(fs, default=False, description="Use '{}' feature set".format(fs))
+      print fs
+      variant(fs, default=False, description="Use '%s' feature set" % fs)
 
     variant('python', default=False, description="build with Python")
     depends_on('python', when='+python')