zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrading kosh to 3.0 (#37471)

Browse Source 
* Upgrading kosh to 3.0.

* Accidentally regressed the package, changing back.

* Updating py-hdbscan versions for kosh.

* Fixing bug in patch.

* Adding 3.0.1

* Removing 3.0.

* Updating package deps for hdbscan to match requirements.txt.

* Version reqs for 3.0.*, need newer numpy and networkx

* spack style

* Reordering to match setup.py, adding "type" to python depends.
This commit is contained in:
Robert Blake 2023-05-15 22:08:20 -07:00 committed by GitHub
parent f7bbc326e4
commit 690661eadd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/py-hdbscan/package.py
View File

@ -23,12 +23,17 @@ class PyHdbscan(PythonPackage):
homepage = "https://github.com/scikit-learn-contrib/hdbscan"
url = "https://github.com/scikit-learn-contrib/hdbscan/archive/0.8.26.tar.gz"
version("0.8.29", sha256="67ba1c00b5ad7c0dca2d662d6036b6df235bd61522a785d68a8458b732555d76")
version("0.8.26", sha256="2fd10906603b6565ee138656b6d59df3494c03c5e8099aede400d50b13af912b")
depends_on("py-setuptools", type="build")
depends_on("py-cython@0.27:", type="build")
depends_on("py-cython@0.27:", type=("build", "run"))
depends_on("py-numpy@1.16.0:", type=("build", "run"))
depends_on("py-numpy@1.20:", type=("build", "run"), when="@0.8.29:")
depends_on("py-scipy@0.9:", type=("build", "run"))
depends_on("py-scipy@1.0:", type=("build", "run"), when="@0.8.29:")
depends_on("py-scikit-learn@0.17:", type=("build", "run"))
depends_on("py-scikit-learn@0.20:", type=("build", "run"), when="@0.8.29:")
depends_on("py-joblib", type=("build", "run"))
depends_on("py-joblib@1.0:", type=("build", "run"), when="@0.8.29:")
depends_on("py-six", type=("build", "run"))

12
var/spack/repos/builtin/packages/py-kosh/package.py
View File

@ -20,6 +20,7 @@ class PyKosh(PythonPackage):
# notify when the package is updated.
maintainers("doutriaux1")
version("3.0.1", sha256="e0d97c93476930ccfe8ed892517439d555760d66d57f9a8e52459fb5910ba398")
version("2.2", sha256="3c79c3b7e7b64018ec5987dd7148886a6c619a28cda6f84e61a57439c9f3d7a3")
version("2.1", sha256="597ed5beb4c3c3675b4af15ee7bfb60a463d5bda2222cd927061737ed073d562")
version("2.0", sha256="059e431e3d3219b53956cb464d9e10933ca141dc89662f55d9c633e35c8b3a1e")
@ -28,3 +29,14 @@ class PyKosh(PythonPackage):
depends_on("py-llnl-sina@1.11:", type=("build", "run"))
depends_on("py-networkx", type=("build", "run"))
depends_on("py-numpy", type=("build", "run"))
with when("@3:"):
depends_on("py-networkx@2.6:", type=("build", "run"))
depends_on("py-numpy@1.20:", type=("build", "run"))
depends_on("py-scipy", type=("build", "run"))
depends_on("py-h5py@3:", type=("build", "run"))
depends_on("py-scikit-learn@1.0.2:", type=("build", "run"))
depends_on("py-pandas", type=("build", "run"))
depends_on("py-hdbscan@0.8.29:", type=("build", "run"))
depends_on("py-matplotlib", type=("build", "run"))
depends_on("py-tqdm", type=("build", "run"))