From 6ee7b5ad914aac801486f811e6a527ebb113c0d7 Mon Sep 17 00:00:00 2001 From: iarspider Date: Sat, 24 Sep 2022 22:41:18 +0200 Subject: Add checksum for py-hist 2.6.1, py-boost-histogram 1.3.1 (#32787) * Add checksum for py-hist 2.6.1 * Swap when and type --- .../repos/builtin/packages/py-boost-histogram/package.py | 5 +++-- var/spack/repos/builtin/packages/py-hist/package.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-boost-histogram/package.py b/var/spack/repos/builtin/packages/py-boost-histogram/package.py index 5b6b8ffb58..c767e3bbd4 100644 --- a/var/spack/repos/builtin/packages/py-boost-histogram/package.py +++ b/var/spack/repos/builtin/packages/py-boost-histogram/package.py @@ -12,11 +12,12 @@ class PyBoostHistogram(PythonPackage): homepage = "https://github.com/scikit-hep/boost-histogram" pypi = "boost_histogram/boost_histogram-1.2.1.tar.gz" + version("1.3.1", sha256="31cd396656f3a37834e07d304cdb84d9906bc2172626a3d92fe577d08bcf410f") version("1.2.1", sha256="a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579") depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools@45:", type="build") depends_on("py-setuptools-scm@4.1.2:+toml", type="build") depends_on("py-numpy@1.13.3:", type=("build", "run")) - depends_on("py-dataclasses", type=("build", "run"), when="^python@:3.6") - depends_on("py-typing-extensions", type=("build", "run"), when="^python@:3.7") + depends_on("py-dataclasses", when="^python@:3.6", type=("build", "run")) + depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-hist/package.py b/var/spack/repos/builtin/packages/py-hist/package.py index edf827b2da..f7212073fa 100644 --- a/var/spack/repos/builtin/packages/py-hist/package.py +++ b/var/spack/repos/builtin/packages/py-hist/package.py @@ -12,6 +12,7 @@ class PyHist(PythonPackage): homepage = "https://github.com/scikit-hep/hist" pypi = "hist/hist-2.5.2.tar.gz" + version("2.6.1", sha256="ee9034795fd2feefed923461aaccaf76f87c1f8d5414b1e704faa293ceb4fc27") version("2.5.2", sha256="0bafb8b956cc041f1b26e8f5663fb8d3b8f7673f56336facb84d8cfdc30ae2cf") variant("plot", default="False", description="Add support for drawing histograms") @@ -19,12 +20,13 @@ class PyHist(PythonPackage): depends_on("python@3.7:", type=("build", "run")) depends_on("py-setuptools@45:", type="build") depends_on("py-setuptools-scm@3.4:+toml", type="build") - depends_on("py-boost-histogram@1.2.0:1.2", type=("build", "run")) + depends_on("py-boost-histogram@1.2.0:1.2", when="@2.5.2", type=("build", "run")) + depends_on("py-boost-histogram@1.3.1:1.3", when="@2.6.1", type=("build", "run")) depends_on("py-histoprint@2.2.0:", type=("build", "run")) depends_on("py-numpy@1.14.5:", type=("build", "run")) - depends_on("py-typing-extensions@3.7:", type=("build", "run"), when="^python@:3.7") + depends_on("py-typing-extensions@3.7:", when="^python@:3.7", type=("build", "run")) - depends_on("py-matplotlib@3.0:", type=("build", "run"), when="+plot") - depends_on("py-scipy@1.4:", type=("build", "run"), when="+plot") - depends_on("py-iminuit@2:", type=("build", "run"), when="+plot") - depends_on("py-mplhep@0.2.16:", type=("build", "run"), when="+plot") + depends_on("py-matplotlib@3.0:", when="+plot", type=("build", "run")) + depends_on("py-scipy@1.4:", when="+plot", type=("build", "run")) + depends_on("py-iminuit@2:", when="+plot", type=("build", "run")) + depends_on("py-mplhep@0.2.16:", when="+plot", type=("build", "run")) -- cgit v1.2.3-70-g09d2