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

Fix activation of sites.py for sncosmo

Browse Source
This commit is contained in:
Adam J. Stewart 2016-06-15 16:42:50 -05:00
parent 24f65c502e
commit 80d444624b
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/py-h5py/package.py
View File

@ -38,14 +38,21 @@ class PyH5py(Package):
variant('mpi', default=False, description='Build with MPI support') 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('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') 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): def install(self, spec, prefix):
python('setup.py', 'configure', python('setup.py', 'configure',
'--hdf5={0}'.format(spec['hdf5'].prefix)) '--hdf5={0}'.format(spec['hdf5'].prefix))

1
var/spack/repos/builtin/packages/py-iminuit/package.py
View File

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

2
var/spack/repos/builtin/packages/py-sncosmo/package.py
View File

@ -36,7 +36,7 @@ class PySncosmo(Package):
# Required dependencies # Required dependencies
# py-sncosmo binaries are duplicates of those from py-astropy # 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-numpy')
depends_on('py-scipy') depends_on('py-scipy')
depends_on('py-astropy') depends_on('py-astropy')

7
var/spack/repos/builtin/packages/python/package.py
View File

@ -167,14 +167,13 @@ def python_ignore(self, ext_pkg, args):
ignore_arg = args.get('ignore', lambda f: False) ignore_arg = args.get('ignore', lambda f: False)
# Always ignore easy-install.pth, as it needs to be merged. # 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. # Ignore pieces of setuptools installed by other packages.
if ext_pkg.name != 'py-setuptools': 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'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': if ext_pkg.name != 'py-numpy':
patterns.append(r'bin/f2py$') patterns.append(r'bin/f2py$')