summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGregory Lee <lee218@llnl.gov>2018-07-05 19:33:32 -0700
committerAdam J. Stewart <ajstewart426@gmail.com>2018-07-05 21:33:32 -0500
commitf8f3fe5b8f16e59b4d7356df36783250d44282f2 (patch)
tree7ca727afa9e9d621f1d448ea722aa62c9a0d9368 /var
parent8a1bbc5d84c92cc204fcf24d8674007965f84a60 (diff)
downloadspack-f8f3fe5b8f16e59b4d7356df36783250d44282f2.tar.gz
spack-f8f3fe5b8f16e59b4d7356df36783250d44282f2.tar.bz2
spack-f8f3fe5b8f16e59b4d7356df36783250d44282f2.tar.xz
spack-f8f3fe5b8f16e59b4d7356df36783250d44282f2.zip
added rpy2 2.9.4 and added py-jinja2 dependency (#8645)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-rpy2/package.py17
1 files 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'))