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

Get Rid of nobuild, nolink, and alldeps (#2765)

Browse Source 
* Removing the nobuild, nolink, and alldeps dependency types in favor of being explicit.
* This will help with maintenance going forward, as adding more dependency types won't affect existing declared dependencies in weird ways.
* default deptype is still `('build', 'link')`
This commit is contained in:
Elizabeth Fischer
2017-01-07 22:59:02 -05:00
committed by Todd Gamblin
parent 68baac0549
commit 402dfe30f9
184 changed files with 508 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ class Antlr(AutotoolsPackage):
variant('python', default=False, description='Enable ANTLR for Python')
extends('python', when='+python')
depends_on('jdk', type='nolink', when='+java')
depends_on('jdk', type=('build', 'run'), when='+java')
def configure_args(self):
spec = self.spec

8
var/spack/repos/builtin/packages/cantera/package.py
View File

@@ -57,10 +57,10 @@ class Cantera(Package):
# Python module dependencies
extends('python', when='+python')
depends_on('py-numpy', when='+python', type=nolink)
depends_on('py-scipy', when='+python', type=nolink)
depends_on('py-cython', when='+python', type=nolink)
depends_on('py-3to2', when='+python', type=nolink)
depends_on('py-numpy', when='+python', type=('build', 'run'))
depends_on('py-scipy', when='+python', type=('build', 'run'))
depends_on('py-cython', when='+python', type=('build', 'run'))
depends_on('py-3to2', when='+python', type=('build', 'run'))
# TODO: these "when" specs don't actually work
# depends_on('py-unittest2', when='+python^python@2.6')
# depends_on('py-unittest2py3k', when='+python^python@3.1')

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

@@ -41,7 +41,7 @@ class Cask(Package):
# version 0.8.0 is broken
version('0.7.4', 'c973a7db43bc980dd83759a5864a1260')
depends_on('emacs', type=nolink)
depends_on('emacs', type=('build', 'run'))
def install(self, spec, prefix):
mkdirp(prefix.bin)

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

@@ -47,7 +47,7 @@ class Cmor(AutotoolsPackage):
extends('python', when='+python')
depends_on('python@:2.7', when='+python')
depends_on('py-numpy', type=nolink, when='+python')
depends_on('py-numpy', type=('build', 'run'), when='+python')
@AutotoolsPackage.precondition('configure')
def validate(self):

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

@@ -36,7 +36,7 @@ class EnvironmentModules(Package):
version('3.2.10', '8b097fdcb90c514d7540bb55a3cb90fb')
# Dependencies:
depends_on('tcl', type=alldeps)
depends_on('tcl', type=('build', 'link', 'run'))
def install(self, spec, prefix):
tcl_spec = spec['tcl']

4
var/spack/repos/builtin/packages/espressopp/package.py
View File

@@ -49,8 +49,8 @@ class Espressopp(CMakePackage):
depends_on("boost+serialization+filesystem+system+python+mpi", when='@1.9.4:')
extends("python")
depends_on("python@2:2.7.13")
depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type='nolink')
depends_on("py-mpi4py@1.3.1:", when='@1.9.4.1:', type='nolink')
depends_on("py-mpi4py@2.0.0:", when='@1.9.4', type=('build', 'run'))
depends_on("py-mpi4py@1.3.1:", when='@1.9.4.1:', type=('build', 'run'))
depends_on("fftw")
depends_on("py-sphinx", when="+ug", type='build')
depends_on("py-sphinx", when="+pdf", type='build')

12
var/spack/repos/builtin/packages/fenics/package.py
View File

@@ -83,12 +83,12 @@ class Fenics(Package):
depends_on('suite-sparse', when='+suite-sparse')
depends_on('qt', when='+qt')
depends_on('py-ply', type=nolink)
depends_on('py-six', type=nolink)
depends_on('py-numpy', type=nolink)
depends_on('py-sympy', type=nolink)
depends_on('swig@3.0.3:', type=nolink)
depends_on('cmake@2.8.12:', type=nolink)
depends_on('py-ply', type=('build', 'run'))
depends_on('py-six', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-sympy', type=('build', 'run'))
depends_on('swig@3.0.3:', type=('build', 'run'))
depends_on('cmake@2.8.12:', type=('build', 'run'))
depends_on('py-setuptools', type='build')
depends_on('py-sphinx@1.0.1:', when='+doc', type='build')

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

@@ -63,7 +63,7 @@ class Gdal(Package):
depends_on("libpng")
depends_on("zlib")
depends_on("proj")
depends_on("py-numpy", type=nolink)
depends_on("py-numpy", type=('build', 'run'))
parallel = False

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

@@ -34,7 +34,7 @@ class Global(Package):
version('6.5', 'dfec818b4f53d91721e247cf7b218078')
depends_on('exuberant-ctags', type=nolink)
depends_on('exuberant-ctags', type=('build', 'run'))
depends_on('ncurses')
def install(self, spec, prefix):

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

@@ -53,7 +53,7 @@ class GoBootstrap(Package):
provides('golang@:1.4-bootstrap-20161024')
depends_on('git', type='alldeps')
depends_on('git', type=('build', 'link', 'run'))
# NOTE: Older versions of Go attempt to download external files that have
# since been moved while running the test suite. This patch modifies the

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

@@ -58,7 +58,7 @@ class Go(Package):
provides('golang')
depends_on('git', type='alldeps')
depends_on('git', type=('build', 'link', 'run'))
# TODO: Make non-c self-hosting compilers feasible without backflips
# should be a dep on external go compiler
depends_on('go-bootstrap', type='build')

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

@@ -46,7 +46,7 @@ class HoomdBlue(Package):
variant('doc', default=True, description='Generate documentation')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('boost+python')
depends_on('cmake', type='build')
depends_on('mpi', when='+mpi')

4
var/spack/repos/builtin/packages/ibmisc/package.py
View File

@@ -59,8 +59,8 @@ class Ibmisc(CMakePackage):
depends_on('netcdf-cxx4', when='+netcdf')
depends_on('udunits2', when='+udunits2')
depends_on('googletest', when='+googletest', type='build')
depends_on('py-cython', when='+python', type=nolink)
depends_on('py-numpy', when='+python', type=nolink)
depends_on('py-cython', when='+python', type=('build', 'run'))
depends_on('py-numpy', when='+python', type=('build', 'run'))
depends_on('boost', when='+boost')
# Build dependencies

6
var/spack/repos/builtin/packages/lmod/package.py
View File

@@ -44,9 +44,9 @@ class Lmod(Package):
version('6.0.1', '91abf52fe5033bd419ffe2842ebe7af9')
depends_on('lua@5.2:')
depends_on('lua-luaposix', type=nolink)
depends_on('lua-luafilesystem', type=nolink)
depends_on('tcl', type=nolink)
depends_on('lua-luaposix', type=('build', 'run'))
depends_on('lua-luafilesystem', type=('build', 'run'))
depends_on('tcl', type=('build', 'run'))
parallel = False

3
var/spack/repos/builtin/packages/lua/package.py
View File

@@ -88,7 +88,8 @@ def append_paths(self, paths, cpaths, path):
def setup_dependent_environment(self, spack_env, run_env, extension_spec):
lua_paths = []
for d in extension_spec.traverse(deptypes=nolink, deptype_query='run'):
for d in extension_spec.traverse(
deptypes=('build', 'run'), deptype_query='run'):
if d.package.extends(self.spec):
lua_paths.append(os.path.join(d.prefix, self.lua_lib_dir))
lua_paths.append(os.path.join(d.prefix, self.lua_share_dir))

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

@@ -41,7 +41,7 @@ class Nwchem(Package):
depends_on('mpi')
depends_on('scalapack')
depends_on('python@2.7:2.8', type=nolink)
depends_on('python@2.7:2.8', type=('build', 'run'))
# patches for 6.6-27746:
urls_for_patches = {

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

@@ -76,7 +76,7 @@ class Opencv(Package):
depends_on('vtk', when='+vtk')
depends_on('qt', when='+qt')
depends_on('jdk', when='+java')
depends_on('py-numpy', when='+python', type='nolink')
depends_on('py-numpy', when='+python', type=('build', 'run'))
extends('python', when='+python')

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

@@ -50,7 +50,7 @@ class Psi4(Package):
'+thread')
depends_on('python')
depends_on('cmake', type='build')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
# Optional dependencies
# TODO: add packages for these

6
var/spack/repos/builtin/packages/py-astroid/package.py
View File

@@ -22,7 +22,7 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import depends_on, extends, version, nolink
from spack import depends_on, extends, version
from spack import Package
@@ -37,9 +37,9 @@ class PyAstroid(Package):
version('1.4.1', 'ed70bfed5e4b25be4292e7fe72da2c02')
extends('python')
depends_on('py-logilab-common', type=nolink)
depends_on('py-logilab-common', type=('build', 'run'))
depends_on('py-setuptools', type='build')
depends_on('py-six', type=nolink)
depends_on('py-six', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

18
var/spack/repos/builtin/packages/py-astropy/package.py
View File

@@ -38,18 +38,18 @@ class PyAstropy(Package):
# Required dependencies
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
# Optional dependencies
depends_on('py-h5py', type=nolink)
depends_on('py-beautifulsoup4', type=nolink)
depends_on('py-pyyaml', type=nolink)
depends_on('py-scipy', type=nolink)
depends_on('py-h5py', type=('build', 'run'))
depends_on('py-beautifulsoup4', type=('build', 'run'))
depends_on('py-pyyaml', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
depends_on('libxml2')
depends_on('py-matplotlib', type=nolink)
depends_on('py-pytz', type=nolink)
depends_on('py-scikit-image', type=nolink)
depends_on('py-pandas', type=nolink)
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-pytz', type=('build', 'run'))
depends_on('py-scikit-image', type=('build', 'run'))
depends_on('py-pandas', type=('build', 'run'))
# System dependencies
depends_on('cfitsio')

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

@@ -38,7 +38,7 @@ class PyAutopep8(Package):
extends('python', ignore='bin/pep8')
depends_on('python@2.6:2.7,3.2:')
depends_on('py-pycodestyle@1.5.7:1.7.0', type=nolink)
depends_on('py-pycodestyle@1.5.7:1.7.0', type=('build', 'run'))
depends_on('py-setuptools', type='build')

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

@@ -39,7 +39,7 @@ class PyBabel(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-pytz', type=nolink)
depends_on('py-pytz', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

6
var/spack/repos/builtin/packages/py-basemap/package.py
View File

@@ -37,9 +37,9 @@ class PyBasemap(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-numpy', type=nolink)
depends_on('py-matplotlib', type=nolink)
depends_on('pil', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('pil', type=('build', 'run'))
depends_on("geos")
def install(self, spec, prefix):

4
var/spack/repos/builtin/packages/py-biopython/package.py
View File

@@ -37,8 +37,8 @@ class PyBiopython(Package):
version('1.65', '143e7861ade85c0a8b5e2bbdd1da1f67')
extends('python')
depends_on('py-mx', type=nolink)
depends_on('py-numpy', type=nolink)
depends_on('py-mx', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

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

@@ -33,7 +33,7 @@ class PyBottleneck(Package):
version('1.0.0', '380fa6f275bd24f27e7cf0e0d752f5d2')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

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

@@ -36,7 +36,7 @@ class PyCclib(Package):
extends('python')
depends_on('py-numpy@1.5:', type=nolink)
depends_on('py-numpy@1.5:', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

4
var/spack/repos/builtin/packages/py-cdo/package.py
View File

@@ -40,8 +40,8 @@ class PyCdo(Package):
depends_on('cdo')
depends_on('py-setuptools', type='build')
depends_on('py-scipy', type=nolink)
depends_on('py-netcdf', type=nolink)
depends_on('py-scipy', type=('build', 'run'))
depends_on('py-netcdf', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -37,7 +37,7 @@ class PyCffi(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-pycparser', type=nolink)
depends_on('py-pycparser', type=('build', 'run'))
depends_on('libffi')
def install(self, spec, prefix):

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

@@ -38,7 +38,7 @@ class PyConfigparser(Package):
extends('python')
depends_on('python@2.6:2.7,3.4:')
depends_on('py-ordereddict', when='^python@2.6:2.6.999', type=nolink)
depends_on('py-ordereddict', when='^python@2.6:2.6.999', type=('build', 'run'))
depends_on('py-setuptools', type='build')

12
var/spack/repos/builtin/packages/py-csvkit/package.py
View File

@@ -36,12 +36,12 @@ class PyCsvkit(Package):
extends('python')
depends_on('py-dateutil', type=nolink)
depends_on('py-dbf', type=nolink)
depends_on('py-xlrd', type=nolink)
depends_on('py-sqlalchemy', type=nolink)
depends_on('py-six', type=nolink)
depends_on('py-openpyxl', type=nolink)
depends_on('py-dateutil', type=('build', 'run'))
depends_on('py-dbf', type=('build', 'run'))
depends_on('py-xlrd', type=('build', 'run'))
depends_on('py-sqlalchemy', type=('build', 'run'))
depends_on('py-six', type=('build', 'run'))
depends_on('py-openpyxl', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

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

@@ -36,7 +36,7 @@ class PyCycler(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-six', type=nolink)
depends_on('py-six', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -36,7 +36,7 @@ class PyDateutil(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-six', type=nolink)
depends_on('py-six', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

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

@@ -35,7 +35,7 @@ class PyEmcee(Package):
version('2.1.0', 'c6b6fad05c824d40671d4a4fc58dfff7')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -37,7 +37,7 @@ class PyEnum34(Package):
extends('python')
depends_on('python@2.4:2.8,3.3:')
depends_on('py-ordereddict', when='^python@:2.6.999', type=nolink)
depends_on('py-ordereddict', when='^python@:2.6.999', type=('build', 'run'))
depends_on('py-setuptools', type='build')

18
var/spack/repos/builtin/packages/py-flake8/package.py
View File

@@ -40,25 +40,25 @@ class PyFlake8(Package):
# Most Python packages only require py-setuptools as a build dependency.
# However, py-flake8 requires py-setuptools during runtime as well.
depends_on('py-setuptools', type=nolink)
depends_on('py-setuptools', type=('build', 'run'))
# pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.3.0
depends_on('py-pyflakes@0.8.1:1.1.0,1.2.3:1.2.3', when='@3.0.4', type=nolink) # noqa
depends_on('py-pyflakes@0.8.1:1.1.0,1.2.3:1.2.3', when='@3.0.4', type=('build', 'run')) # noqa
# pyflakes >= 0.8.1, < 1.1
depends_on('py-pyflakes@0.8.1:1.0.0', when='@2.5.4', type=nolink)
depends_on('py-pyflakes@0.8.1:1.0.0', when='@2.5.4', type=('build', 'run'))
# pycodestyle >= 2.0.0, < 2.1.0
depends_on('py-pycodestyle@2.0.0:2.0.999', when='@3.0.4', type=nolink)
depends_on('py-pycodestyle@2.0.0:2.0.999', when='@3.0.4', type=('build', 'run'))
# pep8 >= 1.5.7, != 1.6.0, != 1.6.1, != 1.6.2
depends_on('py-pycodestyle@1.5.7,1.7.0:', when='@2.5.4', type=nolink)
depends_on('py-pycodestyle@1.5.7,1.7.0:', when='@2.5.4', type=('build', 'run'))
# mccabe >= 0.5.0, < 0.6.0
depends_on('py-mccabe@0.5.0:0.5.999', when='@3.0.4', type=nolink)
depends_on('py-mccabe@0.5.0:0.5.999', when='@3.0.4', type=('build', 'run'))
# mccabe >= 0.2.1, < 0.5
depends_on('py-mccabe@0.2.1:0.4.0', when='@2.5.4', type=nolink)
depends_on('py-mccabe@0.2.1:0.4.0', when='@2.5.4', type=('build', 'run'))
depends_on('py-configparser', when='^python@:3.3.999', type=nolink)
depends_on('py-enum34', when='^python@:3.1.999', type=nolink)
depends_on('py-configparser', when='^python@:3.3.999', type=('build', 'run'))
depends_on('py-enum34', when='^python@:3.1.999', type=('build', 'run'))
# TODO: Add test dependencies
# depends_on('py-nose', type='test')

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

@@ -34,7 +34,7 @@ class PyGnuplot(Package):
version('1.8', 'abd6f571e7aec68ae7db90a5217cd5b1')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

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

@@ -50,10 +50,10 @@ class PyH5py(Package):
depends_on('py-mpi4py', when='+mpi')
# Build and runtime dependencies
depends_on('py-numpy@1.6.1:', type=nolink)
depends_on('py-numpy@1.6.1:', type=('build', 'run'))
# Runtime dependencies
depends_on('py-six', type=nolink)
depends_on('py-six', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('configure', '--hdf5={0}'.format(spec['hdf5'].prefix))

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

@@ -38,8 +38,8 @@ class PyIminuit(Package):
depends_on('py-setuptools', type='build')
# Optional dependencies
depends_on('py-numpy', type=nolink)
depends_on('py-matplotlib', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-cython', type='build')
def install(self, spec, prefix):

4
var/spack/repos/builtin/packages/py-ipython/package.py
View File

@@ -36,8 +36,8 @@ class PyIpython(Package):
version('2.3.1', '2b7085525dac11190bfb45bb8ec8dcbf')
extends('python')
depends_on('py-pygments', type=nolink)
depends_on('py-setuptools', type=nolink)
depends_on('py-pygments', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-backports-shutil-get-terminal-size', when="^python@:3.2.999")
depends_on('py-pathlib2', when="^python@:3.3.999")
depends_on('py-pickleshare')

4
var/spack/repos/builtin/packages/py-jinja2/package.py
View File

@@ -42,8 +42,8 @@ class PyJinja2(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-markupsafe', type=nolink)
depends_on('py-babel@0.8:', type=nolink) # optional, required for i18n
depends_on('py-markupsafe', type=('build', 'run'))
depends_on('py-babel@0.8:', type=('build', 'run')) # optional, required for i18n
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

4
var/spack/repos/builtin/packages/py-logilab-common/package.py
View File

@@ -22,7 +22,7 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
from spack import depends_on, extends, version, nolink
from spack import depends_on, extends, version
from spack import Package
@@ -35,7 +35,7 @@ class PyLogilabCommon(Package):
extends('python', ignore=r'bin/pytest')
depends_on("py-setuptools", type='build')
depends_on("py-six", type=nolink)
depends_on("py-six", type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

4
var/spack/repos/builtin/packages/py-macs2/package.py
View File

@@ -39,8 +39,8 @@ class PyMacs2(Package):
# Most Python packages only require py-setuptools as a build dependency.
# However, py-macs2 requires py-setuptools during runtime as well.
depends_on('py-setuptools', type=nolink)
depends_on('py-numpy@1.6:', type=nolink)
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-numpy@1.6:', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -40,7 +40,7 @@ class PyMako(Package):
depends_on('py-setuptools', type='build')
# depends_on('py-mock', type='test') # TODO: Add test deptype
# depends_on('py-pytest', type='test') # TODO: Add test deptype
depends_on('py-markupsafe@0.9.2:', type=nolink)
depends_on('py-markupsafe@0.9.2:', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

16
var/spack/repos/builtin/packages/py-matplotlib/package.py
View File

@@ -63,16 +63,16 @@ class PyMatplotlib(Package):
depends_on('libpng@1.2:')
depends_on('freetype@2.3:')
depends_on('py-numpy@1.6:', type=nolink)
depends_on('py-dateutil@1.1:', type=nolink)
depends_on('py-pyparsing', type=nolink)
depends_on('py-pytz', type=nolink)
depends_on('py-cycler@0.9:', type=nolink)
depends_on('py-numpy@1.6:', type=('build', 'run'))
depends_on('py-dateutil@1.1:', type=('build', 'run'))
depends_on('py-pyparsing', type=('build', 'run'))
depends_on('py-pytz', type=('build', 'run'))
depends_on('py-cycler@0.9:', type=('build', 'run'))
# ------ Optional GUI frameworks
depends_on('tk@8.3:', when='+tk') # not 8.6.0 or 8.6.1
depends_on('qt', when='+qt')
depends_on('py-pyside', when='+qt', type=nolink)
depends_on('py-pyside', when='+qt', type=('build', 'run'))
# --------- Optional external programs
# ffmpeg/avconv or mencoder
@@ -80,7 +80,7 @@ class PyMatplotlib(Package):
# --------- Optional dependencies
depends_on('pkg-config', type='build') # why not...
depends_on('py-pillow', when='+image', type=nolink)
depends_on('py-pillow', when='+image', type=('build', 'run'))
depends_on('py-ipython', when='+ipython')
depends_on('ghostscript', when='+latex', type='run')
depends_on('texlive', when='+latex', type='run')
@@ -93,7 +93,7 @@ class PyMatplotlib(Package):
# depends_on('agg@2.4:')
depends_on('qhull@2012.1:')
# depends_on('ttconv')
depends_on('py-six@1.9.0:', type=nolink)
depends_on('py-six@1.9.0:', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('build')

6
var/spack/repos/builtin/packages/py-meep/package.py
View File

@@ -37,9 +37,9 @@ class PyMeep(Package):
variant('mpi', default=True, description='Enable MPI support')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-scipy', type=nolink)
depends_on('py-matplotlib', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('mpi', when='+mpi')
depends_on('meep~mpi', when='~mpi')

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

@@ -36,7 +36,7 @@ class PyMock(Package):
version('1.3.0', '73ee8a4afb3ff4da1b4afa287f39fdeb')
extends('python')
depends_on('py-pbr', type=nolink)
depends_on('py-pbr', type=('build', 'run'))
depends_on('py-setuptools@17.1:', type='build')
def install(self, spec, prefix):

4
var/spack/repos/builtin/packages/py-nestle/package.py
View File

@@ -35,10 +35,10 @@ class PyNestle(Package):
# Required dependencies
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
# Optional dependencies
depends_on('py-scipy', type=nolink)
depends_on('py-scipy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

6
var/spack/repos/builtin/packages/py-netcdf/package.py
View File

@@ -33,9 +33,9 @@ class PyNetcdf(Package):
version('1.2.3.1', '4fc4320d4f2a77b894ebf8da1c9895af')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-cython', type=nolink)
depends_on('py-setuptools', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-cython', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('netcdf')
def install(self, spec, prefix):

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

@@ -35,7 +35,7 @@ class PyNetworkx(Package):
extends('python')
depends_on('py-decorator', type=nolink)
depends_on('py-decorator', type=('build', 'run'))
depends_on('py-setuptools', type='build')
def install(self, spec, prefix):

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

@@ -34,7 +34,7 @@ class PyNumexpr(Package):
version('2.5', '84f66cced45ba3e30dcf77a937763aaa')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

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

@@ -35,7 +35,7 @@ class PyOpenpyxl(Package):
extends('python')
depends_on('py-jdcal', type=nolink)
depends_on('py-jdcal', type=('build', 'run'))
depends_on('py-setuptools', type='build')
def install(self, spec, prefix):

10
var/spack/repos/builtin/packages/py-pandas/package.py
View File

@@ -43,12 +43,12 @@ class PyPandas(Package):
version('0.18.0', 'f143762cd7a59815e348adf4308d2cf6')
extends('python')
depends_on('py-dateutil', type=nolink)
depends_on('py-numpy', type=nolink)
depends_on('py-dateutil', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-setuptools', type='build')
depends_on('py-pytz', type=nolink)
depends_on('py-numexpr', type=nolink)
depends_on('py-bottleneck', type=nolink)
depends_on('py-pytz', type=('build', 'run'))
depends_on('py-numexpr', type=('build', 'run'))
depends_on('py-bottleneck', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

4
var/spack/repos/builtin/packages/py-periodictable/package.py
View File

@@ -34,8 +34,8 @@ class PyPeriodictable(Package):
version('1.4.1', '7246b63cc0b6b1be6e86b6616f9e866e')
depends_on('py-numpy', type=nolink)
depends_on('py-pyparsing', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-pyparsing', type=('build', 'run'))
extends('python')
def install(self, spec, prefix):

8
var/spack/repos/builtin/packages/py-phonopy/package.py
View File

@@ -34,10 +34,10 @@ class PyPhonopy(Package):
version('1.10.0', '973ed1bcea46e21b9bf747aab9061ff6')
extends('python')
depends_on('py-numpy', type=nolink)
depends_on('py-scipy', type=nolink)
depends_on('py-matplotlib', type=nolink)
depends_on('py-pyyaml', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-pyyaml', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--home=%s' % prefix)

4
var/spack/repos/builtin/packages/py-pudb/package.py
View File

@@ -37,8 +37,8 @@ class PyPudb(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-urwid@1.1.1:', type=nolink)
depends_on('py-pygments@1.0:', type=nolink)
depends_on('py-urwid@1.1.1:', type=('build', 'run'))
depends_on('py-pygments@1.0:', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -46,7 +46,7 @@ class PyPycodestyle(Package):
# Most Python packages only require py-setuptools as a build dependency.
# However, py-pycodestyle requires py-setuptools during runtime as well.
depends_on('py-setuptools', type=nolink)
depends_on('py-setuptools', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -46,7 +46,7 @@ class PyPyflakes(Package):
# Most Python packages only require py-setuptools as a build dependency.
# However, py-pyflakes requires py-setuptools during runtime as well.
depends_on('py-setuptools', type=nolink)
depends_on('py-setuptools', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

6
var/spack/repos/builtin/packages/py-pylint/package.py
View File

@@ -34,9 +34,9 @@ class PyPylint(Package):
version('1.4.3', '5924c1c7ca5ca23647812f5971d0ea44')
extends('python', ignore=r'bin/pytest')
depends_on('py-six', type=nolink)
depends_on('py-astroid', type=nolink)
depends_on('py-logilab-common', type=nolink)
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')

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

@@ -35,7 +35,7 @@ class PyPyqt(Package):
version('4.11.3', '997c3e443165a89a559e0d96b061bf70')
extends('python')
depends_on('py-sip', type=nolink)
depends_on('py-sip', type=('build', 'run'))
# TODO: allow qt5 when conditional deps are supported.
# TODO: Fix version matching so that @4 works like @:4

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

@@ -38,7 +38,7 @@ class PyPyside(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-sphinx', type=nolink)
depends_on('py-sphinx', type=('build', 'run'))
depends_on('qt@4.5:4.9')
depends_on('libxml2@2.6.32:')
depends_on('libxslt@1.1.19:')

6
var/spack/repos/builtin/packages/py-pytables/package.py
View File

@@ -37,9 +37,9 @@ class PyPytables(Package):
extends('python')
depends_on('hdf5')
depends_on('py-numpy', type=nolink)
depends_on('py-numexpr', type=nolink)
depends_on('py-cython', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-numexpr', type=('build', 'run'))
depends_on('py-cython', type=('build', 'run'))
depends_on('py-setuptools', type='build')
def install(self, spec, prefix):

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

@@ -37,7 +37,7 @@ class PyPytest(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-py@1.4.29:', type=nolink)
depends_on('py-py@1.4.29:', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -44,7 +44,7 @@ class PyPythonDaemon(Package):
extends("python")
depends_on("py-setuptools", type='build')
depends_on("py-lockfile", type=nolink)
depends_on("py-lockfile", type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

4
var/spack/repos/builtin/packages/py-restview/package.py
View File

@@ -34,8 +34,8 @@ class PyRestview(Package):
version('2.6.1', 'ac8b70e15b8f1732d1733d674813666b')
extends('python')
depends_on('py-docutils', type=nolink)
depends_on('py-pygments', type=nolink)
depends_on('py-docutils', type=('build', 'run'))
depends_on('py-pygments', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

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

@@ -39,7 +39,7 @@ class PyRpy2(Package):
version('2.5.6', 'a36e758b633ce6aec6a5f450bfee980f')
extends('python')
depends_on('py-six', type=nolink)
depends_on('py-six', type=('build', 'run'))
depends_on('py-setuptools', type='build')
depends_on('R')

12
var/spack/repos/builtin/packages/py-scikit-image/package.py
View File

@@ -36,12 +36,12 @@ class PyScikitImage(Package):
extends('python', ignore=r'bin/.*\.py$')
depends_on('py-dask', type=nolink)
depends_on('pil', type=nolink)
depends_on('py-networkx', type=nolink)
depends_on('py-six', type=nolink)
depends_on('py-scipy', type=nolink)
depends_on('py-matplotlib', type=nolink)
depends_on('py-dask', type=('build', 'run'))
depends_on('pil', type=('build', 'run'))
depends_on('py-networkx', type=('build', 'run'))
depends_on('py-six', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-setuptools', type='build')
def install(self, spec, prefix):

4
var/spack/repos/builtin/packages/py-scikit-learn/package.py
View File

@@ -37,8 +37,8 @@ class PyScikitLearn(Package):
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-numpy', type=nolink)
depends_on('py-scipy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix=%s' % prefix)

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

@@ -44,7 +44,7 @@ class PyScipy(Package):
depends_on('py-nose', type='build')
# Known not to work with 2.23, 2.25
depends_on('binutils@2.26:', type='build')
depends_on('py-numpy@1.7.1:+blas+lapack', type=nolink)
depends_on('py-numpy@1.7.1:+blas+lapack', type=('build', 'run'))
depends_on('blas')
depends_on('lapack')

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

@@ -37,15 +37,15 @@ class PySncosmo(Package):
# Required dependencies
# py-sncosmo binaries are duplicates of those from py-astropy
extends('python', ignore=r'bin/.*')
depends_on('py-numpy', type=nolink)
depends_on('py-scipy', type=nolink)
depends_on('py-astropy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
depends_on('py-astropy', type=('build', 'run'))
# Recommended dependencies
depends_on('py-matplotlib', type=nolink)
depends_on('py-iminuit', type=nolink)
depends_on('py-emcee', type=nolink)
depends_on('py-nestle', type=nolink)
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-iminuit', type=('build', 'run'))
depends_on('py-emcee', type=('build', 'run'))
depends_on('py-nestle', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

20
var/spack/repos/builtin/packages/py-sphinx/package.py
View File

@@ -38,17 +38,17 @@ class PySphinx(Package):
# Most Python packages only require py-setuptools as a build dependency.
# However, py-sphinx requires py-setuptools during runtime as well.
depends_on('py-setuptools', type=nolink)
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-six@1.4:', type=nolink)
depends_on('py-jinja2@2.3:', type=nolink)
depends_on('py-pygments@2.0:', type=nolink)
depends_on('py-docutils@0.11:', type=nolink)
depends_on('py-snowballstemmer@1.1:', type=nolink)
depends_on('py-babel@1.3:', type=nolink) # not 2.0
depends_on('py-alabaster@0.7:', type=nolink)
depends_on('py-imagesize', when='@1.4:', type=nolink)
depends_on('py-sphinx-rtd-theme@0.1:', type=nolink) # optional as of 1.4
depends_on('py-six@1.4:', type=('build', 'run'))
depends_on('py-jinja2@2.3:', type=('build', 'run'))
depends_on('py-pygments@2.0:', type=('build', 'run'))
depends_on('py-docutils@0.11:', type=('build', 'run'))
depends_on('py-snowballstemmer@1.1:', type=('build', 'run'))
depends_on('py-babel@1.3:', type=('build', 'run')) # not 2.0
depends_on('py-alabaster@0.7:', type=('build', 'run'))
depends_on('py-imagesize', when='@1.4:', type=('build', 'run'))
depends_on('py-sphinx-rtd-theme@0.1:', type=('build', 'run')) # optional as of 1.4
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

4
var/spack/repos/builtin/packages/py-traitlets/package.py
View File

@@ -38,12 +38,12 @@ class PyTraitlets(Package):
version('4.2.0', '53553a10d124e264fd2e234d0571b7d0')
version('4.1.0', 'd5bc75c7bd529afb40afce86c2facc3a')
version('4.0.0', 'b5b95ea5941fd9619b4704dfd8201568')
version('4.0' , '14544e25ccf8e920ed1cbf833852481f')
version('4.0', '14544e25ccf8e920ed1cbf833852481f')
extends('python')
depends_on('py-setuptools', type='build')
depends_on('py-decorator', type=nolink)
depends_on('py-decorator', type=('build', 'run'))
depends_on('py-ipython-genutils')
depends_on('py-enum34', when='^python@:3.3')

4
var/spack/repos/builtin/packages/py-tuiview/package.py
View File

@@ -36,8 +36,8 @@ class PyTuiview(Package):
version('1.1.7', '4b3b38a820cc239c8ab4a181ac5d4c30')
extends("python")
depends_on("py-pyqt", type=nolink)
depends_on("py-numpy", type=nolink)
depends_on("py-pyqt", type=('build', 'run'))
depends_on("py-numpy", type=('build', 'run'))
depends_on("gdal")
def install(self, spec, prefix):

6
var/spack/repos/builtin/packages/py-wcsaxes/package.py
View File

@@ -35,9 +35,9 @@ class PyWcsaxes(Package):
version('0.8', 'de1c60fdae4c330bf5ddb9f1ab5ab920')
extends('python', ignore=r'bin/pbr')
depends_on('py-numpy', type=nolink)
depends_on('py-matplotlib', type=nolink)
depends_on('py-astropy', type=nolink)
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-astropy', type=('build', 'run'))
def install(self, spec, prefix):
setup_py('install', '--prefix={0}'.format(prefix))

16
var/spack/repos/builtin/packages/py-yt/package.py
View File

@@ -56,15 +56,15 @@ class PyYt(Package):
extends("python")
depends_on("py-astropy", type="nolink", when="+astropy")
depends_on("py-cython", type="nolink")
depends_on("py-h5py", type="nolink", when="+h5py")
depends_on("py-ipython", type="nolink")
depends_on("py-matplotlib", type="nolink")
depends_on("py-numpy", type="nolink")
depends_on("py-scipy", type="nolink", when="+scipy")
depends_on("py-astropy", type=('build', 'run'), when="+astropy")
depends_on("py-cython", type=('build', 'run'))
depends_on("py-h5py", type=('build', 'run'), when="+h5py")
depends_on("py-ipython", type=('build', 'run'))
depends_on("py-matplotlib", type=('build', 'run'))
depends_on("py-numpy", type=('build', 'run'))
depends_on("py-scipy", type=('build', 'run'), when="+scipy")
depends_on("py-setuptools", type="build")
depends_on("py-sympy", type="nolink")
depends_on("py-sympy", type=('build', 'run'))
depends_on("python @2.7:2.999,3.4:")
def install(self, spec, prefix):

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

@@ -347,7 +347,8 @@ def setup_dependent_environment(self, spack_env, run_env, extension_spec):
spack_env.set('PYTHONHOME', prefix.strip('\n'))
python_paths = []
for d in extension_spec.traverse(deptype=nolink, deptype_query='run'):
for d in extension_spec.traverse(
deptype=('build', 'run'), deptype_query='run'):
if d.package.extends(self.spec):
python_paths.append(join_path(d.prefix,
self.site_packages_dir))

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

@@ -35,4 +35,4 @@ class RC50(RPackage):
version('0.1.0-24', '42631e65c5c579532cc6edf5ea175949')
depends_on('r-partykit', type=nolink)
depends_on('r-partykit', type=('build','run'))

10
var/spack/repos/builtin/packages/r-car/package.py
View File

@@ -35,8 +35,8 @@ class RCar(RPackage):
version('2.1-2', '0f78ad74ef7130126d319acec23951a0')
depends_on('r-mass', type=nolink)
depends_on('r-mgcv', type=nolink)
depends_on('r-nnet', type=nolink)
depends_on('r-pbkrtest', type=nolink)
depends_on('r-quantreg', type=nolink)
depends_on('r-mass', type=('build','run'))
depends_on('r-mgcv', type=('build','run'))
depends_on('r-nnet', type=('build','run'))
depends_on('r-pbkrtest', type=('build','run'))
depends_on('r-quantreg', type=('build','run'))

14
var/spack/repos/builtin/packages/r-caret/package.py
View File

@@ -35,10 +35,10 @@ class RCaret(RPackage):
version('6.0-70', '202d7abb6a679af716ea69fb2573f108')
depends_on('r-lattice', type=nolink)
depends_on('r-ggplot2', type=nolink)
depends_on('r-car', type=nolink)
depends_on('r-foreach', type=nolink)
depends_on('r-plyr', type=nolink)
depends_on('r-nlme', type=nolink)
depends_on('r-reshape2', type=nolink)
depends_on('r-lattice', type=('build','run'))
depends_on('r-ggplot2', type=('build','run'))
depends_on('r-car', type=('build','run'))
depends_on('r-foreach', type=('build','run'))
depends_on('r-plyr', type=('build','run'))
depends_on('r-nlme', type=('build','run'))
depends_on('r-reshape2', type=('build','run'))

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

@@ -38,4 +38,4 @@ class RCatools(RPackage):
version('1.17.1', '5c872bbc78b177b306f36709deb44498')
depends_on('r-bitops', type=nolink)
depends_on('r-bitops', type=('build','run'))

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

@@ -35,4 +35,4 @@ class RClass(RPackage):
version('7.3-14', '6a21dd206fe4ea29c55faeb65fb2b71e')
depends_on('r-mass', type=nolink)
depends_on('r-mass', type=('build','run'))

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

@@ -37,4 +37,4 @@ class RDatatable(RPackage):
version('1.9.6', 'b1c0c7cce490bdf42ab288541cc55372')
depends_on('r-chron', type='nolink')
depends_on('r-chron', type=('build', 'run'))

16
var/spack/repos/builtin/packages/r-devtools/package.py
View File

@@ -34,11 +34,11 @@ class RDevtools(RPackage):
version('1.11.1', '242672ee27d24dddcbdaac88c586b6c2')
depends_on('r-httr', type=nolink)
depends_on('r-memoise', type=nolink)
depends_on('r-whisker', type=nolink)
depends_on('r-digest', type=nolink)
depends_on('r-rstudioapi', type=nolink)
depends_on('r-jsonlite', type=nolink)
depends_on('r-git2r', type=nolink)
depends_on('r-withr', type=nolink)
depends_on('r-httr', type=('build', 'run'))
depends_on('r-memoise', type=('build', 'run'))
depends_on('r-whisker', type=('build', 'run'))
depends_on('r-digest', type=('build', 'run'))
depends_on('r-rstudioapi', type=('build', 'run'))
depends_on('r-jsonlite', type=('build', 'run'))
depends_on('r-git2r', type=('build', 'run'))
depends_on('r-withr', type=('build', 'run'))

14
var/spack/repos/builtin/packages/r-diagrammer/package.py
View File

@@ -34,10 +34,10 @@ class RDiagrammer(RPackage):
version('0.8.4', '9ee295c744f5d4ba9a84289ca7bdaf1a')
depends_on('r-htmlwidgets', type=nolink)
depends_on('r-igraph', type=nolink)
depends_on('r-influencer', type=nolink)
depends_on('r-rstudioapi@0.6:', type=nolink)
depends_on('r-stringr', type=nolink)
depends_on('r-visnetwork', type=nolink)
depends_on('r-scales', type=nolink)
depends_on('r-htmlwidgets', type=('build', 'run'))
depends_on('r-igraph', type=('build', 'run'))
depends_on('r-influencer', type=('build', 'run'))
depends_on('r-rstudioapi@0.6:', type=('build', 'run'))
depends_on('r-stringr', type=('build', 'run'))
depends_on('r-visnetwork', type=('build', 'run'))
depends_on('r-scales', type=('build', 'run'))

4
var/spack/repos/builtin/packages/r-doparallel/package.py
View File

@@ -35,5 +35,5 @@ class RDoparallel(RPackage):
version('1.0.10', 'd9fbde8f315d98d055483ee3493c9b43')
depends_on('r-foreach', type=nolink)
depends_on('r-iterators', type=nolink)
depends_on('r-foreach', type=('build', 'run'))
depends_on('r-iterators', type=('build', 'run'))

16
var/spack/repos/builtin/packages/r-dplyr/package.py
View File

@@ -35,11 +35,11 @@ class RDplyr(RPackage):
version('0.5.0', '1fcafcacca70806eea2e6d465cdb94ef')
depends_on('r-assertthat', type=nolink)
depends_on('r-r6', type=nolink)
depends_on('r-rcpp', type=nolink)
depends_on('r-tibble', type=nolink)
depends_on('r-magrittr', type=nolink)
depends_on('r-lazyeval', type=nolink)
depends_on('r-dbi', type=nolink)
depends_on('r-bh', type=nolink)
depends_on('r-assertthat', type=('build', 'run'))
depends_on('r-r6', type=('build', 'run'))
depends_on('r-rcpp', type=('build', 'run'))
depends_on('r-tibble', type=('build', 'run'))
depends_on('r-magrittr', type=('build', 'run'))
depends_on('r-lazyeval', type=('build', 'run'))
depends_on('r-dbi', type=('build', 'run'))
depends_on('r-bh', type=('build', 'run'))

6
var/spack/repos/builtin/packages/r-dt/package.py
View File

@@ -36,6 +36,6 @@ class RDt(RPackage):
version('0.1', '5c8df984921fa484784ec4b8a4fb6f3c')
depends_on('r-htmltools', type=nolink)
depends_on('r-htmlwidgets', type=nolink)
depends_on('r-magrittr', type=nolink)
depends_on('r-htmltools', type=('build', 'run'))
depends_on('r-htmlwidgets', type=('build', 'run'))
depends_on('r-magrittr', type=('build', 'run'))

8
var/spack/repos/builtin/packages/r-dygraphs/package.py
View File

@@ -38,7 +38,7 @@ class RDygraphs(RPackage):
version('0.9', '7f0ce4312bcd3f0a58b8c03b2772f833')
depends_on('r-magrittr', type=nolink)
depends_on('r-htmlwidgets', type=nolink)
depends_on('r-zoo', type=nolink)
depends_on('r-xts', type=nolink)
depends_on('r-magrittr', type=('build', 'run'))
depends_on('r-htmlwidgets', type=('build', 'run'))
depends_on('r-zoo', type=('build', 'run'))
depends_on('r-xts', type=('build', 'run'))

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

@@ -36,4 +36,4 @@ class RE1071(RPackage):
version('1.6-7', 'd109a7e3dd0c905d420e327a9a921f5a')
depends_on('r-class', type=nolink)
depends_on('r-class', type=('build', 'run'))

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

@@ -37,4 +37,4 @@ class REvaluate(RPackage):
version('0.9', '877d89ce8a9ef7f403b1089ca1021775')
depends_on('r-stringr', type=nolink)
depends_on('r-stringr', type=('build', 'run'))

4
var/spack/repos/builtin/packages/r-foreach/package.py
View File

@@ -40,5 +40,5 @@ class RForeach(RPackage):
version('1.4.3', 'ef45768126661b259f9b8994462c49a0')
depends_on('r-codetools', type=nolink)
depends_on('r-iterators', type=nolink)
depends_on('r-codetools', type=('build', 'run'))
depends_on('r-iterators', type=('build', 'run'))

8
var/spack/repos/builtin/packages/r-formatr/package.py
View File

@@ -39,7 +39,7 @@ class RFormatr(RPackage):
version('1.4', '98b9b64b2785b35f9df403e1aab6c73c')
depends_on('r-codetools', type=nolink)
depends_on('r-shiny', type=nolink)
depends_on('r-testit', type=nolink)
# depends_on('r-knitr', type=nolink) - mutual dependency
depends_on('r-codetools', type=('build', 'run'))
depends_on('r-shiny', type=('build', 'run'))
depends_on('r-testit', type=('build', 'run'))
# depends_on('r-knitr', type=('build', 'run')) - mutual dependency

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

@@ -50,4 +50,4 @@ class RGdata(RPackage):
version('2.17.0', 'c716b663b9dc16ad8cafe6acc781a75f')
depends_on('r-gtools', type=nolink)
depends_on('r-gtools', type=('build', 'run'))

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

@@ -36,4 +36,4 @@ class RGeosphere(RPackage):
version('1.5-5', '28efb7a8e266c7f076cdbcf642455f3e')
depends_on('r-sp', type=nolink)
depends_on('r-sp', type=('build', 'run'))

24
var/spack/repos/builtin/packages/r-ggmap/package.py
View File

@@ -37,15 +37,15 @@ class RGgmap(RPackage):
version('2.6.1', '25ad414a3a1c6d59a227a9f22601211a')
depends_on('r-ggplot2', type=nolink)
depends_on('r-proto', type=nolink)
depends_on('r-rgooglemaps', type=nolink)
depends_on('r-png', type=nolink)
depends_on('r-plyr', type=nolink)
depends_on('r-reshape2', type=nolink)
depends_on('r-rjson', type=nolink)
depends_on('r-mapproj', type=nolink)
depends_on('r-jpeg', type=nolink)
depends_on('r-geosphere', type=nolink)
depends_on('r-digest', type=nolink)
depends_on('r-scales', type=nolink)
depends_on('r-ggplot2', type=('build', 'run'))
depends_on('r-proto', type=('build', 'run'))
depends_on('r-rgooglemaps', type=('build', 'run'))
depends_on('r-png', type=('build', 'run'))
depends_on('r-plyr', type=('build', 'run'))
depends_on('r-reshape2', type=('build', 'run'))
depends_on('r-rjson', type=('build', 'run'))
depends_on('r-mapproj', type=('build', 'run'))
depends_on('r-jpeg', type=('build', 'run'))
depends_on('r-geosphere', type=('build', 'run'))
depends_on('r-digest', type=('build', 'run'))
depends_on('r-scales', type=('build', 'run'))

12
var/spack/repos/builtin/packages/r-ggplot2/package.py
View File

@@ -40,9 +40,9 @@ class RGgplot2(RPackage):
version('2.1.0', '771928cfb97c649c720423deb3ec7fd3')
depends_on('r-digest', type=nolink)
depends_on('r-gtable', type=nolink)
depends_on('r-mass', type=nolink)
depends_on('r-plyr', type=nolink)
depends_on('r-reshape2', type=nolink)
depends_on('r-scales', type=nolink)
depends_on('r-digest', type=('build', 'run'))
depends_on('r-gtable', type=('build', 'run'))
depends_on('r-mass', type=('build', 'run'))
depends_on('r-plyr', type=('build', 'run'))
depends_on('r-reshape2', type=('build', 'run'))
depends_on('r-scales', type=('build', 'run'))

14
var/spack/repos/builtin/packages/r-ggvis/package.py
View File

@@ -36,10 +36,10 @@ class RGgvis(RPackage):
version('0.4.2', '039f45e5c7f1e0652779163d7d99f922')
depends_on('r-assertthat', type=nolink)
depends_on('r-jsonlite', type=nolink)
depends_on('r-shiny', type=nolink)
depends_on('r-magrittr', type=nolink)
depends_on('r-dplyr', type=nolink)
depends_on('r-lazyeval', type=nolink)
depends_on('r-htmltools', type=nolink)
depends_on('r-assertthat', type=('build', 'run'))
depends_on('r-jsonlite', type=('build', 'run'))
depends_on('r-shiny', type=('build', 'run'))
depends_on('r-magrittr', type=('build', 'run'))
depends_on('r-dplyr', type=('build', 'run'))
depends_on('r-lazyeval', type=('build', 'run'))
depends_on('r-htmltools', type=('build', 'run'))

14
var/spack/repos/builtin/packages/r-gistr/package.py
View File

@@ -40,10 +40,10 @@ class RGistr(RPackage):
version('0.3.6', '49d548cb3eca0e66711aece37757a2c0')
depends_on('r-jsonlite', type=nolink)
depends_on('r-httr', type=nolink)
depends_on('r-magrittr', type=nolink)
depends_on('r-assertthat', type=nolink)
depends_on('r-knitr', type=nolink)
depends_on('r-rmarkdown', type=nolink)
depends_on('r-dplyr', type=nolink)
depends_on('r-jsonlite', type=('build', 'run'))
depends_on('r-httr', type=('build', 'run'))
depends_on('r-magrittr', type=('build', 'run'))
depends_on('r-assertthat', type=('build', 'run'))
depends_on('r-knitr', type=('build', 'run'))
depends_on('r-rmarkdown', type=('build', 'run'))
depends_on('r-dplyr', type=('build', 'run'))

4
var/spack/repos/builtin/packages/r-glmnet/package.py
View File

@@ -39,5 +39,5 @@ class RGlmnet(RPackage):
version('2.0-5', '049b18caa29529614cd684db3beaec2a')
depends_on('r-matrix', type=nolink)
depends_on('r-foreach', type=nolink)
depends_on('r-matrix', type=('build', 'run'))
depends_on('r-foreach', type=('build', 'run'))

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

@@ -38,4 +38,4 @@ class RGooglevis(RPackage):
version('0.6.0', 'ec36fd2a6884ddc7baa894007d0d0468')
depends_on('r-jsonlite', type=nolink)
depends_on('r-jsonlite', type=('build', 'run'))

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

@@ -35,4 +35,4 @@ class RGridextra(RPackage):
version('2.2.1', '7076c2122d387c7ef3add69a1c4fc1b2')
depends_on('r-gtable', type=nolink)
depends_on('r-gtable', type=('build', 'run'))

Some files were not shown because too many files have changed in this diff Show More