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
Download Patch File Download Diff File Expand all files Collapse all files

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)
# 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$')