Merge branch 'pull/256' into develop

5 files changed, 25 insertions, 11 deletions

diff --git a/lib/spack/external/pyqver2.py b/lib/spack/external/pyqver2.py
index 4a16e2811e..4690239748 100755
--- a/lib/spack/external/pyqver2.py
+++ b/lib/spack/external/pyqver2.py
@@ -30,7 +30,8 @@ import sys
 StandardModules = {
     "__future__":       (2, 1),
     "abc":              (2, 6),
-    "argparse":         (2, 7),
+# skip argparse now that it's in lib/spack/external
+#    "argparse":         (2, 7),
     "ast":              (2, 6),
     "atexit":           (2, 0),
     "bz2":              (2, 3),
diff --git a/lib/spack/spack/test/python_version.py b/lib/spack/spack/test/python_version.py
index ba570b416f..2ea5febb11 100644
--- a/lib/spack/spack/test/python_version.py
+++ b/lib/spack/spack/test/python_version.py
@@ -63,10 +63,6 @@ class PythonVersionTest(unittest.TestCase):
         all_issues = {}
 
         for fn in files:
-            if fn != '/Users/gamblin2/src/spack/var/spack/packages/vim/package.py':
-                continue
-            print fn
-
             with open(fn) as pyfile:
                 versions = pyqver2.get_versions(pyfile.read())
                 for ver, reasons in versions.items():
diff --git a/var/spack/packages/cfitsio/package.py b/var/spack/packages/cfitsio/package.py
new file mode 100644
index 0000000000..ff450cb5f3
--- /dev/null
+++ b/var/spack/packages/cfitsio/package.py
@@ -0,0 +1,18 @@
+from spack import *
+
+class Cfitsio(Package):
+    """
+    CFITSIO is a library of C and Fortran subroutines for reading and writing
+    data files in FITS (Flexible Image Transport System) data format.
+    """
+    homepage = 'http://heasarc.gsfc.nasa.gov/fitsio/'
+    version('3.370', 'abebd2d02ba5b0503c633581e3bfa116')
+
+    def url_for_version(self, v):
+        url = 'ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio{0}.tar.gz'
+        return url.format(str(v).replace('.', ''))
+
+    def install(self, spec, prefix):
+        configure('--prefix=' + prefix)
+        make()
+        make('install')
diff --git a/var/spack/packages/global/package.py b/var/spack/packages/global/package.py
index a77b1bdc09..e8f06516d9 100644
--- a/var/spack/packages/global/package.py
+++ b/var/spack/packages/global/package.py
@@ -4,7 +4,7 @@ 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"
 
@@ -13,9 +13,9 @@ class Global(Package):
     depends_on('exuberant-ctags')
 
     def install(self, spec, prefix):
-        config_args = ['--prefix={}'.format(prefix)]
+        config_args = ['--prefix={0}'.format(prefix)]
 
-        config_args.append('--with-exuberant-ctags={}'.format(
+        config_args.append('--with-exuberant-ctags={0}'.format(
             os.path.join(spec['exuberant-ctags'].prefix.bin, 'ctags')))
 
         configure(*config_args)
diff --git a/var/spack/packages/tmuxinator/package.py b/var/spack/packages/tmuxinator/package.py
index 26c061cbd6..77ae063e5d 100644
--- a/var/spack/packages/tmuxinator/package.py
+++ b/var/spack/packages/tmuxinator/package.py
@@ -5,7 +5,7 @@ class Tmuxinator(Package):
     homepage = "https://github.com/tmuxinator/tmuxinator"
     url      = "https://github.com/tmuxinator/tmuxinator"
 
-    version('0.6.11', 
+    version('0.6.11',
         git='https://github.com/tmuxinator/tmuxinator',
         tag='v0.6.11')
 
@@ -13,5 +13,4 @@ class Tmuxinator(Package):
 
     def install(self, spec, prefix):
       gem('build', 'tmuxinator.gemspec')
-      gem('install', 'tmuxinator-{}.gem'.format(self.version))
-
+      gem('install', 'tmuxinator-{0}.gem'.format(self.version))