From f8f3fe5b8f16e59b4d7356df36783250d44282f2 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Thu, 5 Jul 2018 19:33:32 -0700 Subject: added rpy2 2.9.4 and added py-jinja2 dependency (#8645) --- var/spack/repos/builtin/packages/py-rpy2/package.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index ad7a9ecf01..79deaed32f 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -35,14 +35,25 @@ class PyRpy2(PythonPackage): homepage = "https://pypi.python.org/pypi/rpy2" url = "https://pypi.io/packages/source/r/rpy2/rpy2-2.5.4.tar.gz" - version('2.5.4', '115a20ac30883f096da2bdfcab55196d') + version('2.9.4', '7df2562cdf43a0ccdd1e44ee1c16614f') + version('2.8.6', '85046aa58ba586622f67271fbca05933') version('2.5.6', 'a36e758b633ce6aec6a5f450bfee980f') + version('2.5.4', '115a20ac30883f096da2bdfcab55196d') # FIXME: Missing dependencies: # ld: cannot find -licuuc # ld: cannot find -licui18 - depends_on('py-six', type=('build', 'run')) + # All versions depends_on('py-setuptools', type='build') + depends_on('r', type=('build', 'run')) + + # @2.9.0: + depends_on('r@3.3:', when='@2.9.0:', type=('build', 'run')) + depends_on('python@3:', when='@2.9.0:', type=('build', 'run')) + depends_on('py-jinja2', when='@2.9.0:', type=('build', 'run')) + depends_on('py-six', when='@2.9.0:', type=('build', 'run')) - depends_on('r') + # @:2.8.6 + depends_on('r@2.8:', when='@:2.8.6', type=('build', 'run')) + depends_on('py-singledispatch', when='^python@:2', type=('build', 'run')) -- cgit v1.2.3-70-g09d2