diff options
| author | Jen Herting <jen@herting.cc> | 2023-08-28 07:43:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 07:43:25 -0400 |
| commit | 98daf5b7ecc74152b36c77051c58f2ed0ada1670 (patch) | |
| tree | 39b9c6a25cd7638e947b3d8e7a5c44b5169863ad | |
| parent | 8a3d98b63265a5cd81f2fd2b06b7eb8d77be1f66 (diff) | |
| download | spack-98daf5b7ecc74152b36c77051c58f2ed0ada1670.tar.gz spack-98daf5b7ecc74152b36c77051c58f2ed0ada1670.tar.bz2 spack-98daf5b7ecc74152b36c77051c58f2ed0ada1670.tar.xz spack-98daf5b7ecc74152b36c77051c58f2ed0ada1670.zip | |
py-scikit-optimize: add v0.9.0 and move gptune patch (#38738)
Co-authored-by: liuyangzhuan <liuyangzhuan@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/gptune/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gptune/space.patch (renamed from var/spack/repos/builtin/packages/py-scikit-optimize/space.patch) | 0 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-scikit-optimize/package.py | 14 |
3 files changed, 9 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/gptune/package.py b/var/spack/repos/builtin/packages/gptune/package.py index 16b6f7aff4..f9a7c7695b 100644 --- a/var/spack/repos/builtin/packages/gptune/package.py +++ b/var/spack/repos/builtin/packages/gptune/package.py @@ -41,7 +41,7 @@ class Gptune(CMakePackage): depends_on("py-scikit-learn", type=("build", "run")) depends_on("py-matplotlib", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) - depends_on("py-scikit-optimize@master+gptune", type=("build", "run")) + depends_on("py-scikit-optimize@0.9.0", patches=[patch("space.patch")], type=("build", "run")) depends_on("py-gpy", type=("build", "run")) depends_on("py-lhsmdu", type=("build", "run")) depends_on("py-hpbandster", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-scikit-optimize/space.patch b/var/spack/repos/builtin/packages/gptune/space.patch index c608bbb78a..c608bbb78a 100644 --- a/var/spack/repos/builtin/packages/py-scikit-optimize/space.patch +++ b/var/spack/repos/builtin/packages/gptune/space.patch diff --git a/var/spack/repos/builtin/packages/py-scikit-optimize/package.py b/var/spack/repos/builtin/packages/py-scikit-optimize/package.py index 0c4bfec54f..1bf5da83e1 100644 --- a/var/spack/repos/builtin/packages/py-scikit-optimize/package.py +++ b/var/spack/repos/builtin/packages/py-scikit-optimize/package.py @@ -21,17 +21,19 @@ class PyScikitOptimize(PythonPackage): maintainers("liuyangzhuan") version("master", branch="master") + version("0.9.0", sha256="77d8c9e64947fc9f5cc05bbc6aed7b8a9907871ae26fe11997fd67be90f26008") version("0.5.2", sha256="1d7657a4b8ef9aa6d81e49b369c677c584e83269f11710557741d3b3f8fa0a75") - variant("plots", default=True, description="Build with plot support from py-matplotlib") - variant("gptune", default=False, description="Build with patches for GPTune") depends_on("py-setuptools", type="build") depends_on("py-numpy", type=("build", "run")) - depends_on("py-scipy@0.14.0:", type=("build", "run")) + depends_on("py-numpy@1.13.3:", when="@0.9:", type=("build", "run")) + depends_on("py-scipy@0.14:", type=("build", "run")) + depends_on("py-scipy@0.19.1:", when="@0.9:", type=("build", "run")) depends_on("py-scikit-learn@0.19.1:", type=("build", "run")) - depends_on("py-pyyaml", when="+gptune", type=("build", "run")) + depends_on("py-scikit-learn@0.20:", when="@0.9:", type=("build", "run")) + depends_on("py-pyaml@16.9:", when="@0.9:", type=("build", "run")) + depends_on("py-joblib@0.11:", when="@0.9:", type=("build", "run")) depends_on("py-matplotlib", when="+plots") - - patch("space.patch", when="+gptune") + depends_on("py-matplotlib@2:", when="@0.9:+plots") |