From 6498b752d1dcc030c7045c6d1c4c77141ca07985 Mon Sep 17 00:00:00 2001 From: iarspider Date: Sat, 6 Jun 2020 23:33:34 +0200 Subject: [PATCH] Add rpy2@3.0.4 (#16924) * Add rpy2@3.0.4 * Style fixes * Update package.py * Proper Python version requirement --- .../repos/builtin/packages/py-rpy2/package.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-rpy2/package.py b/var/spack/repos/builtin/packages/py-rpy2/package.py index d3578c2cc2..ef9b847b00 100644 --- a/var/spack/repos/builtin/packages/py-rpy2/package.py +++ b/var/spack/repos/builtin/packages/py-rpy2/package.py @@ -16,6 +16,7 @@ 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('3.0.4', sha256='2af5158a5d56af7f7bf5e54d8d7e87b6f115ff40f056d82f93cad0cbf6acc0cb') version('3.0.0', sha256='34efc2935d9015527837d6b1de29641863d184b19d39ad415d5384be8a015bce') version('2.9.4', sha256='be57f741d0c284b5d8785ab03dff0e829303e5ac30e548d5ceb46e05b168812e') version('2.8.6', sha256='004d13734a7b9a85cbc1e7a93ec87df741e28db1273ab5b0d9efaac04a9c5f98') @@ -30,12 +31,18 @@ class PyRpy2(PythonPackage): depends_on('py-setuptools', type='build') depends_on('r', type=('build', 'run')) + # @3.0.0: + depends_on('py-cffi@1.0.0:', when='@3.0.0:', type=('build', 'run')) + depends_on('py-simplegeneric', when='@3.0.0:', type=('build', 'run')) + depends_on('py-pytest', when='@3:', 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@3.3:', when='@2.9.0:', type=('build', 'run')) + depends_on('python@3.5:', 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:2.9.999', type=('build', 'run')) # @:2.8.6 - depends_on('r@2.8:', when='@:2.8.6', type=('build', 'run')) + depends_on('r@2.8:', when='@:2.8.6', type=('build', 'run')) depends_on('py-singledispatch', when='^python@:2', type=('build', 'run')) + depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))