From 10c637aca0880e33b792c96c5ba58ed22a8bbb7e Mon Sep 17 00:00:00 2001 From: Jonas Eschle Date: Wed, 3 Apr 2024 20:55:00 -0400 Subject: [PATCH] py-zfit: add v0.18.* (#43200) Co-authored-by: Valentin Volkl --- .../repos/builtin/packages/py-zfit/package.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-zfit/package.py b/var/spack/repos/builtin/packages/py-zfit/package.py index c8810f9cd6..a09d14175c 100644 --- a/var/spack/repos/builtin/packages/py-zfit/package.py +++ b/var/spack/repos/builtin/packages/py-zfit/package.py @@ -18,15 +18,17 @@ class PyZfit(PythonPackage): maintainers("jonas-eschle") license("BSD-3-Clause", checked_by="jonas-eschle") - # TODO: reactivate once TF 2.15 is ready https://github.com/spack/spack/pull/41069 - # version("0.18.1", sha256="fbc6b3a636d8dc74fb2e69dfec5855f534c4583ec18efac9e9107ad45b18eb43") - # version("0.18.0", sha256="21d9479480f74945c67707b715780693bd4e94062c551bf41fe04a2eddb47fab") + tags = ["likelihood", "statistics", "inference", "fitting", "hep"] + + version("0.18.2", sha256="099b111e135937966b4c6342c7738731f112aea33e1b9f4a9785d2eac9e530f1") + version("0.18.1", sha256="fbc6b3a636d8dc74fb2e69dfec5855f534c4583ec18efac9e9107ad45b18eb43") + version("0.18.0", sha256="21d9479480f74945c67707b715780693bd4e94062c551bf41fe04a2eddb47fab") version("0.17.0", sha256="cd60dfc360c82666af4e8dddd78edb0ab95a095b9dd0868457f0981dc03afa5a") version("0.16.0", sha256="b3b170af23b61d7e265d6fb1bab1d052003f3fb41b3c537527cc1e5a1066dc10") version("0.15.5", sha256="00a1138429e8a7f830c9e229b9c0bcd6071b95dadd8c87eb81191079fb679225") version("0.14.1", sha256="66d1e349403f1d6c6350138d0f2b422046bcbdfb34fd95453dadae29a8b0c98a") - depends_on("python@3.8:3.11", type=("build", "run")) + depends_on("python@3.9:3.11", type=("build", "run")) depends_on("py-setuptools@42:", type="build") depends_on("py-setuptools-scm-git-archive", type="build") depends_on("py-setuptools-scm@3.4:+toml", type="build") @@ -37,9 +39,8 @@ class PyZfit(PythonPackage): # TODO: remove "build" once fixed in spack that tests need "run", not "build" with default_args(type=("build", "run")): - # TODO: reactivate once TF 2.15 is ready https://github.com/spack/spack/pull/41069 - # depends_on("py-tensorflow@2.15", type=("run"), when="@0.18") - # depends_on("py-tensorflow-probability@0.23", type=("run"), when="@0.18") + depends_on("py-tensorflow@2.15", type=("run"), when="@0.18") + depends_on("py-tensorflow-probability@0.23", type=("run"), when="@0.18") depends_on("py-tensorflow@2.13", when="@0.15:0.17") depends_on("py-tensorflow-probability@0.21", when="@0.16:0.17") @@ -54,7 +55,7 @@ class PyZfit(PythonPackage): with when("+hs3"): depends_on("py-asdf") - depends_on("py-attrs", when="@0.15:18.0") + depends_on("py-attrs", when="@0.15:") depends_on("py-typing-extensions", when="^python@:3.8") depends_on("py-boost-histogram") depends_on("py-colorama")