diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-02-17 00:22:18 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-02-17 00:22:18 -0800 |
| commit | 57f331e2acf75c5bf4c464d0df888fd882295a68 (patch) | |
| tree | 52220184e0dc06f92ee2bba986f269365e08e848 /var | |
| parent | 67db8ddca8ac7ab9adeb827a7dadd34a385b2b6b (diff) | |
| download | spack-57f331e2acf75c5bf4c464d0df888fd882295a68.tar.gz spack-57f331e2acf75c5bf4c464d0df888fd882295a68.tar.bz2 spack-57f331e2acf75c5bf4c464d0df888fd882295a68.tar.xz spack-57f331e2acf75c5bf4c464d0df888fd882295a68.zip | |
Ignore conflicting nose tests in py-nose and py-matplotlib.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/py-matplotlib/package.py | 3 | ||||
| -rw-r--r-- | var/spack/packages/py-nose/package.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/var/spack/packages/py-matplotlib/package.py b/var/spack/packages/py-matplotlib/package.py index f6b9c587fd..04037f004e 100644 --- a/var/spack/packages/py-matplotlib/package.py +++ b/var/spack/packages/py-matplotlib/package.py @@ -8,7 +8,8 @@ class PyMatplotlib(Package): version('1.4.2', '7d22efb6cce475025733c50487bd8898') - extends('python') + extends('python', ignore=r'bin/nosetests.*$') + depends_on('py-pyside') depends_on('py-ipython') depends_on('py-pyparsing') diff --git a/var/spack/packages/py-nose/package.py b/var/spack/packages/py-nose/package.py index b902a35fbb..155019289d 100644 --- a/var/spack/packages/py-nose/package.py +++ b/var/spack/packages/py-nose/package.py @@ -9,7 +9,7 @@ class PyNose(Package): version('1.3.4', '6ed7169887580ddc9a8e16048d38274d') - extends('python') + extends('python', ignore=r'bin/nosetests.*$') depends_on('py-setuptools') def install(self, spec, prefix): |