From 3e087f2e25ee82ea7fafe2a144991703c5825911 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Fri, 23 Jun 2017 08:51:45 -0500 Subject: Remove test dependencies from Python packages (#4572) * Remove test dependencies from Python packages * Make test deptype more clear for a couple more packages --- var/spack/repos/builtin/packages/py-brian2/package.py | 6 +++--- var/spack/repos/builtin/packages/py-matplotlib/package.py | 5 +++-- var/spack/repos/builtin/packages/py-pylint/package.py | 4 +++- var/spack/repos/builtin/packages/py-pynn/package.py | 4 +++- var/spack/repos/builtin/packages/py-qtconsole/package.py | 4 +++- var/spack/repos/builtin/packages/py-theano/package.py | 9 +++++---- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-brian2/package.py b/var/spack/repos/builtin/packages/py-brian2/package.py index 28d1005432..c3582a516d 100644 --- a/var/spack/repos/builtin/packages/py-brian2/package.py +++ b/var/spack/repos/builtin/packages/py-brian2/package.py @@ -34,7 +34,7 @@ class PyBrian2(PythonPackage): version('2.0.1', 'df5990e9a71f7344887bc02f54dfd0f0') version('2.0rc3', '3100c5e4eb9eb83a06ff0413a7d43152') - variant('docs', default=False) + variant('docs', default=False, description='Build the documentation') # depends on py-setuptools@6: for windows, if spack targets windows, # this will need to be added here @@ -45,6 +45,6 @@ class PyBrian2(PythonPackage): depends_on('py-jinja2@2.7:', type=('build', 'run')) depends_on('py-cpuinfo@0.1.6:', type=('build', 'run')) - # depends_on('py-nosetests@1.0:', type=('build', 'run')) # extra test - depends_on('py-nosetests@1.0:', type=('build', 'run'), when='+docs') + # TODO: Add a 'test' deptype + # depends_on('py-nosetests@1.0:', type='test') depends_on('py-sphinx@1.4.2:', type=('build', 'run'), when='+docs') diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index 9948c85727..24dfab5c92 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -93,8 +93,9 @@ class PyMatplotlib(PythonPackage): depends_on('texlive', when='+latex', type='run') # Testing dependencies - depends_on('py-nose') # type='test' - depends_on('py-mock') # type='test' + # TODO: Add a 'test' deptype + # depends_on('py-nose', type='test') + # depends_on('py-mock', type='test') # Required libraries that ship with matplotlib # depends_on('agg@2.4:') diff --git a/var/spack/repos/builtin/packages/py-pylint/package.py b/var/spack/repos/builtin/packages/py-pylint/package.py index 84830c9bcf..b825ed68dc 100644 --- a/var/spack/repos/builtin/packages/py-pylint/package.py +++ b/var/spack/repos/builtin/packages/py-pylint/package.py @@ -37,5 +37,7 @@ class PyPylint(PythonPackage): depends_on('py-six', type=('build', 'run')) depends_on('py-astroid', type=('build', 'run')) depends_on('py-logilab-common', type=('build', 'run')) - depends_on('py-nose', type='build') depends_on('py-setuptools', type='build') + + # TODO: Add a 'test' deptype + # depends_on('py-nose', type='test') diff --git a/var/spack/repos/builtin/packages/py-pynn/package.py b/var/spack/repos/builtin/packages/py-pynn/package.py index 55f847d4fe..ffe0ea64af 100644 --- a/var/spack/repos/builtin/packages/py-pynn/package.py +++ b/var/spack/repos/builtin/packages/py-pynn/package.py @@ -42,8 +42,10 @@ class PyPynn(PythonPackage): depends_on('python@2.6:2.8,3.3:') depends_on('py-jinja2@2.7:', type=('build', 'run')) depends_on('py-docutils@0.10:', type=('build', 'run')) - depends_on('py-mock@1.0:', type=('build', 'run')) depends_on('py-numpy@1.5:', type=('build', 'run')) depends_on('py-quantities@0.10:', type=('build', 'run')) depends_on('py-lazyarray@0.2.9:', type=('build', 'run')) depends_on('py-neo@0.3:', type=('build', 'run')) + + # TODO: Add a 'test' deptype + # depends_on('py-mock@1.0:', type='test') diff --git a/var/spack/repos/builtin/packages/py-qtconsole/package.py b/var/spack/repos/builtin/packages/py-qtconsole/package.py index 73f423943a..0fba249988 100644 --- a/var/spack/repos/builtin/packages/py-qtconsole/package.py +++ b/var/spack/repos/builtin/packages/py-qtconsole/package.py @@ -42,4 +42,6 @@ class PyQtconsole(PythonPackage): depends_on('py-pygments', type=('build', 'run')) depends_on('py-traitlets', type=('build', 'run')) depends_on('py-sphinx@1.3:', type=('build', 'run'), when='+docs') - # mock; python_version=="2.7" and extra == 'test' + + # TODO: Add a 'test' deptype + # depends_on('py-mock', type='test', when='^python@2.7:2.8') diff --git a/var/spack/repos/builtin/packages/py-theano/package.py b/var/spack/repos/builtin/packages/py-theano/package.py index 3d64726511..72bab1ce09 100644 --- a/var/spack/repos/builtin/packages/py-theano/package.py +++ b/var/spack/repos/builtin/packages/py-theano/package.py @@ -34,7 +34,7 @@ class PyTheano(PythonPackage): version('0.8.2', 'f2d0dfe7df141115201077cd933b2c52') - variant('gpu', default=False, + variant('gpu', default=False, description='Builds with support for GPUs via CUDA and cuDNN') depends_on('python@2.6:2.8,3.3:') @@ -48,6 +48,7 @@ class PyTheano(PythonPackage): depends_on('cuda', when='+gpu') depends_on('libgpuarray', when='+gpu') - # test requirements - # depends_on('py-nose@1.3.0:', type=('build', 'run')) - # depends_on('py-nose-parameterized@0.5.0:', type=('build', 'run')) + + # TODO: Add a 'test' deptype + # depends_on('py-nose@1.3.0:', type='test') + # depends_on('py-nose-parameterized@0.5.0:', type='test') -- cgit v1.2.3-60-g2f50