diff options
author | snehring <7978778+snehring@users.noreply.github.com> | 2023-05-22 14:44:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-22 14:44:00 -0500 |
commit | 693c1821b0a903faddde72638be39b539a762740 (patch) | |
tree | 4f67bee6921ca99880eeb7393a5ec92f7a9337e1 | |
parent | 62afe3bd5a3a5d8b68babb0b313467685c643e5a (diff) | |
download | spack-693c1821b0a903faddde72638be39b539a762740.tar.gz spack-693c1821b0a903faddde72638be39b539a762740.tar.bz2 spack-693c1821b0a903faddde72638be39b539a762740.tar.xz spack-693c1821b0a903faddde72638be39b539a762740.zip |
py-pastml: adding version for compatibility with py-topiary-asr (#37828)
-rw-r--r-- | var/spack/repos/builtin/packages/py-pastml/package.py | 4 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/py-topiary-asr/package.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-pastml/package.py b/var/spack/repos/builtin/packages/py-pastml/package.py index 9e75b05798..a9585483ce 100644 --- a/var/spack/repos/builtin/packages/py-pastml/package.py +++ b/var/spack/repos/builtin/packages/py-pastml/package.py @@ -17,13 +17,15 @@ class PyPastml(PythonPackage): maintainers("snehring") version("1.9.40", sha256="5334bc8de70a968117240b90d90878ac935be18de6e6e485fb1a8f90cd539fea") + version("1.9.38", sha256="43bf7d2a3a9b9b67da7c5881ecdeb2ee9cccd1585b8f65700e53761609945cc6") depends_on("python@3.8:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-ete3@3.1.1:", type=("build", "run")) depends_on("py-pandas@1.0.0:", type=("build", "run")) - depends_on("py-numpy@1.22:", type=("build", "run")) + depends_on("py-numpy@1.19.0:", type=("build", "run"), when="@1.9.38") + depends_on("py-numpy@1.22:", type=("build", "run"), when="@1.9.40") depends_on("py-jinja2@2.11.0:", type=("build", "run")) depends_on("py-scipy@1.5.0:", type=("build", "run")) depends_on("py-itolapi@4.0.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-topiary-asr/package.py b/var/spack/repos/builtin/packages/py-topiary-asr/package.py index ec09c18b22..af6f5766cb 100644 --- a/var/spack/repos/builtin/packages/py-topiary-asr/package.py +++ b/var/spack/repos/builtin/packages/py-topiary-asr/package.py @@ -23,7 +23,8 @@ class PyTopiaryAsr(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-biopython", type=("build", "run")) - depends_on("py-numpy@:1.21", type=("build", "run")) + depends_on("py-numpy@:1.21", type=("build", "run"), when="@0.9.9") + depends_on("py-numpy", type=("build", "run"), when="@main") depends_on("py-pandas", type=("build", "run")) depends_on("py-matplotlib", type=("build", "run")) depends_on("py-ete3", type=("build", "run")) |