diff options
| author | Joe Koning <koning@users.noreply.github.com> | 2020-10-08 12:56:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 14:56:10 -0500 |
| commit | a7de469f58b9b93110dc481c1c5c11cf7cf50a9a (patch) | |
| tree | 4cac05f56965f63ba375665a6398b1da50180a31 /var | |
| parent | ee8d225757c5132326e8878ac626c1422e614e91 (diff) | |
| download | spack-a7de469f58b9b93110dc481c1c5c11cf7cf50a9a.tar.gz spack-a7de469f58b9b93110dc481c1c5c11cf7cf50a9a.tar.bz2 spack-a7de469f58b9b93110dc481c1c5c11cf7cf50a9a.tar.xz spack-a7de469f58b9b93110dc481c1c5c11cf7cf50a9a.zip | |
Update of py-merlin for merlin-1.7.5 (#19069)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-merlin/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-merlin/package.py b/var/spack/repos/builtin/packages/py-merlin/package.py index c4185e9193..199c0bcd5f 100644 --- a/var/spack/repos/builtin/packages/py-merlin/package.py +++ b/var/spack/repos/builtin/packages/py-merlin/package.py @@ -13,6 +13,8 @@ class PyMerlin(PythonPackage): url = "https://pypi.io/packages/source/m/merlin/merlin-1.4.1.tar.gz" git = "https://github.com/LLNL/merlin.git" + version('1.7.5', sha256='1994c1770ec7fc9da216f9d0ca8214684dcc0daa5fd55337b96e308b2e68daaa') + version('1.7.4', sha256='9a6f8a84a1b52d0bfb0dc7bdbd7e15677e4a1041bd25a49a2d965efe503a6c20') version('1.4.1', sha256='9d515cfdbcde2443892afd92b78dbc5bf2aed2060ed3a336e683188e015bca7c') version('master', branch='master') version('develop', branch='develop') @@ -23,11 +25,12 @@ class PyMerlin(PythonPackage): depends_on('py-pytest', type='test') depends_on('py-cached-property', type=('build', 'run')) - depends_on('py-celery@4.3.0:+redis', type=('build', 'run')) + depends_on('py-celery@5.0.0+redis+sqlalchemy', when="@1.7.5:", type=('build', 'run')) + depends_on('py-celery@4.3.0:4.999+redis+sqlalchemy', when="@:1.7.4", type=('build', 'run')) depends_on('py-coloredlogs@10.0:', type=('build', 'run')) depends_on('py-cryptography', type=('build', 'run')) depends_on('py-importlib-resources', when="^python@3.0:3.6.99", type=('build', 'run')) - depends_on('py-maestrowf@1.1.7dev0:', when="@1.2.0:", type=('build', 'run')) + depends_on('py-maestrowf@1.1.7dev0', when="@1.2.0:", type=('build', 'run')) depends_on('py-maestrowf@1.1.6:', when="@:1.1.99", type=('build', 'run')) depends_on('py-numpy', type=('build', 'run')) depends_on('py-parse', type=('build', 'run')) |