summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGavin John <gavinnjohn@gmail.com>2023-10-03 09:55:15 -0500
committerGitHub <noreply@github.com>2023-10-03 09:55:15 -0500
commite8f230199fc96e29c2651d3f632af1c01c54cbc0 (patch)
tree031ad067f43d78a0350b21be209cfee0b46fada5 /var
parent1e3c7abc1c3ad50b259bc0bd97b21969e1e32265 (diff)
downloadspack-e8f230199fc96e29c2651d3f632af1c01c54cbc0.tar.gz
spack-e8f230199fc96e29c2651d3f632af1c01c54cbc0.tar.bz2
spack-e8f230199fc96e29c2651d3f632af1c01c54cbc0.tar.xz
spack-e8f230199fc96e29c2651d3f632af1c01c54cbc0.zip
py-biom-format: Fix package file issues and bring up to date (#39962)
* Fix python versioning issue for py-biom-format * Update deps according to feedback * Remove version requirement for py-cython Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Only depend on py-six for versions >=2.1.10 Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * Add py-future as non-dependency for 2.1.15 * There we are. Everything anyone could ever want * Missed cython version change Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> --------- Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-biom-format/package.py28
1 files changed, 19 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/py-biom-format/package.py b/var/spack/repos/builtin/packages/py-biom-format/package.py
index e96614165e..79175dbfcb 100644
--- a/var/spack/repos/builtin/packages/py-biom-format/package.py
+++ b/var/spack/repos/builtin/packages/py-biom-format/package.py
@@ -13,6 +13,10 @@ class PyBiomFormat(PythonPackage):
pypi = "biom-format/biom-format-2.1.6.tar.gz"
+ version("2.1.15", sha256="3bda2096e663dc1cb6f90f51b394da0838b9be5164a44370c134ce5b3b2a4dd3")
+ version("2.1.14", sha256="c8bac94ab6aa8226c0d38af7a3341d65e5f3664b9f45ec44fdf8b5275b2f92c1")
+ version("2.1.13", sha256="c48ed8fe978adaff5832f9d65ffcf8b735298bb2175b0360251d556baac5d4dc")
+ version("2.1.12", sha256="a4460e803b2abfcabe76d5d8fec0f3f7e76a8cd0e09bf22bb38dea9fca224ac2")
version("2.1.10", sha256="f5a277a8144f0b114606852c42f657b9cfde44b3cefa0b2638ab1c1d5e1d0488")
version("2.1.9", sha256="18a6e4d4b4b2a6bf2d5544fa357ad168bedeac93f0837015ef9c72f41fa89491")
version("2.1.7", sha256="b47e54282ef13cddffdb00aea9183a87175a2372c91a915259086a3f444c42f4")
@@ -20,12 +24,18 @@ class PyBiomFormat(PythonPackage):
depends_on("python@2.7:", type=("build", "run"))
depends_on("python@3:", type=("build", "run"), when="@2.1.9:")
- depends_on("py-setuptools", type=("build", "run"))
- depends_on("py-cython@0.29:", type="build")
- depends_on("py-h5py", type=("build", "run"))
- depends_on("py-click", type=("build", "run"), when="@2.1.5:")
- depends_on("py-numpy@1.9.2:", type=("build", "run"))
- depends_on("py-future@0.16.0:", type=("build", "run"))
- depends_on("py-scipy@1.3.1:", type=("build", "run"))
- depends_on("py-pandas@0.20.0:", type=("build", "run"))
- depends_on("py-six@1.10.0:", type=("build", "run"))
+ depends_on("py-setuptools", type="build")
+ depends_on("py-cython", type="build")
+ depends_on("py-h5py@2.2.0:", type=("build", "run"))
+ depends_on("py-click", type=("build", "run"))
+ depends_on("py-numpy@1.3.0:", type=("build", "run"))
+ depends_on("py-numpy@1.9.2:", type=("build", "run"), when="@2.1.7:")
+ depends_on("py-future@0.16.0:", type=("build", "run"), when="@:2.1.10")
+ depends_on("py-scipy@0.13.0:", type=("build", "run"))
+ depends_on("py-scipy@1.3.1:", type=("build", "run"), when="@2.1.8:")
+ depends_on("py-pandas@0.19.2:", type=("build", "run"))
+ depends_on("py-pandas@0.20.0:", type=("build", "run"), when="@2.1.7:")
+ depends_on("py-six@1.10.0:", type=("build", "run"), when="@:2.1.10")
+
+ # https://github.com/biocore/biom-format/pull/865
+ conflicts("^python@3.10:", when="@:2.1.10")