diff options
author | Mike Renfro <mike+github@renf.ro> | 2024-02-04 05:16:22 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-04 05:16:22 -0600 |
commit | 55ecc47dce6d72888ac385486c1a9fb2b572ba31 (patch) | |
tree | b1115fe7cf998769fd37dcb1a72448f890940482 | |
parent | f2125882c5732773c7228fc69a55e0f2c69408d3 (diff) | |
download | spack-55ecc47dce6d72888ac385486c1a9fb2b572ba31.tar.gz spack-55ecc47dce6d72888ac385486c1a9fb2b572ba31.tar.bz2 spack-55ecc47dce6d72888ac385486c1a9fb2b572ba31.tar.xz spack-55ecc47dce6d72888ac385486c1a9fb2b572ba31.zip |
fix ipyrad numpy dependencies (#42098)
* fix ipyrad numpy depedencies
ipyrad versions through 0.9.90 use np.int, which is deprecated in numpy 1.20.
* fix whitespace
* Correct numpy dependency restrictions
-rw-r--r-- | var/spack/repos/builtin/packages/py-ipyrad/package.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-ipyrad/package.py b/var/spack/repos/builtin/packages/py-ipyrad/package.py index 0e0c3fa309..b1ede89ae5 100644 --- a/var/spack/repos/builtin/packages/py-ipyrad/package.py +++ b/var/spack/repos/builtin/packages/py-ipyrad/package.py @@ -17,6 +17,9 @@ class PyIpyrad(PythonPackage): license("GPL-3.0-only") + version("0.9.93", sha256="7f42396c0baa284dde0e9896270006f3c7e2211fa93bb149decccd39b4ab557e") + version("0.9.92", sha256="f9cb5eca40d5fc1d93364815af7608d0b2e89fcf675724541a50e7159617395f") + version("0.9.91", sha256="0308b829a8995db90608e8f45b76709d394d9153ec5edee568acdd41ecfab59c") version("0.9.90", sha256="8b95aa3bae30da15baba90abb03176932411ff708c54d5e4481b811cceb8a4a8") version("0.9.85", sha256="17b07466531655db878919e426743ac649cfab2e92c06c4e45f76ee1517633f9") @@ -30,7 +33,10 @@ class PyIpyrad(PythonPackage): depends_on("py-notebook", type=("build", "run")) depends_on("samtools", type=("build", "run")) depends_on("vsearch", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) + depends_on("py-numpy@:1.23", when="@:0.9.90", type=("build", "run")) + # https://github.com/spack/spack/pull/42098 indicates 0.9.90 and below use + # np.int and related functions, deprecated in 1.20 and expired in 1.24. + depends_on("py-numpy", when="@0.9.91:", type=("build", "run")) depends_on("py-scipy", type=("build", "run")) depends_on("py-pandas", type=("build", "run")) depends_on("py-h5py", type=("build", "run")) |