Fix activation of sites.py for sncosmo

var/spack/repos/builtin/packages/py-h5py/package.py

@@ -38,14 +38,21 @@ class PyH5py(Package):
 
     variant('mpi', default=False, description='Build with MPI support')
 
-    extends('python', ignore=r'bin/cy.*')
+    extends('python')
 
+    # Build dependencies
+    depends_on('py-cython@0.19:')
+    depends_on('pkg-config')
     depends_on('hdf5@1.8.4:+mpi', when='+mpi')
     depends_on('hdf5@1.8.4:~mpi', when='~mpi')
-    depends_on('py-numpy@1.6.1:')
-    depends_on('py-cython')
     depends_on('mpi', when='+mpi')
 
+    # Build and runtime dependencies
+    depends_on('py-numpy@1.6.1:')
+
+    # Runtime dependencies
+    depends_on('py-six')
+
     def install(self, spec, prefix):
         python('setup.py', 'configure',
                '--hdf5={0}'.format(spec['hdf5'].prefix))

var/spack/repos/builtin/packages/py-iminuit/package.py

@@ -40,6 +40,7 @@ class PyIminuit(Package):
     # Optional dependencies
     depends_on('py-numpy')
     depends_on('py-matplotlib')
+    depends_on('py-cython')
 
     def install(self, spec, prefix):
         python('setup.py', 'install', '--prefix={0}'.format(prefix))

var/spack/repos/builtin/packages/py-sncosmo/package.py

@@ -36,7 +36,7 @@ class PySncosmo(Package):
 
     # Required dependencies
     # py-sncosmo binaries are duplicates of those from py-astropy
-    extends('python', ignore=r'bin/*')
+    extends('python', ignore=r'bin/.*')
     depends_on('py-numpy')
     depends_on('py-scipy')
     depends_on('py-astropy')

var/spack/repos/builtin/packages/python/package.py

@@ -167,14 +167,13 @@ def python_ignore(self, ext_pkg, args):
         ignore_arg = args.get('ignore', lambda f: False)
 
         # Always ignore easy-install.pth, as it needs to be merged.
-        patterns = [r'easy-install\.pth$']
+        patterns = [r'site-packages/easy-install\.pth$']
 
         # Ignore pieces of setuptools installed by other packages.
         if ext_pkg.name != 'py-setuptools':
-            patterns.append(r'/site[^/]*\.pyc?$')
-            patterns.append(r'setuptools\.pth')
             patterns.append(r'bin/easy_install[^/]*$')
-            patterns.append(r'setuptools.*egg$')
+            patterns.append(r'site-packages/setuptools\.pth$')
+            patterns.append(r'site-packages/site[^/]*\.pyc?$')
         if ext_pkg.name != 'py-numpy':
             patterns.append(r'bin/f2py$')