From 2936573fc6b0cd760e21028c826205092ece665c Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Fri, 3 Feb 2023 16:28:16 +0100 Subject: py-glmsingle: add 1.1 (#35311) --- .../repos/builtin/packages/py-glmsingle/package.py | 27 ++++++++++++---------- 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-glmsingle/package.py b/var/spack/repos/builtin/packages/py-glmsingle/package.py index fac81f2a27..a47fe0d82d 100644 --- a/var/spack/repos/builtin/packages/py-glmsingle/package.py +++ b/var/spack/repos/builtin/packages/py-glmsingle/package.py @@ -14,6 +14,7 @@ class PyGlmsingle(PythonPackage): git = "https://github.com/cvnlab/GLMsingle.git" version("main", branch="main") + version("1.1", sha256="3fe3cb1f0d1e96976f2c707b1f9e8ddb932b74f58e99debbfa6f17761fdbd37b") version("1.0", sha256="0481f8ea7637d7e9cb53a7f22c73ba67b9fb8aefebc8c6c98bd4712de95db6aa") depends_on("py-setuptools", type="build") @@ -22,17 +23,19 @@ class PyGlmsingle(PythonPackage): depends_on("py-scipy", type=("build", "run")) depends_on("py-scikit-learn", type=("build", "run")) depends_on("py-matplotlib", type=("build", "run")) - depends_on("py-twine", when="@:1", type=("build", "run")) - depends_on("py-sphinx", when="@:1", type=("build", "run")) - depends_on("py-seaborn", when="@:1", type=("build", "run")) - depends_on("py-pybids@0.8.0", when="@:1", type=("build", "run")) - depends_on("py-duecredit", when="@:1", type=("build", "run")) - depends_on("py-ww", when="@:1", type=("build", "run")) - depends_on("py-numba", when="@:1", type=("build", "run")) depends_on("py-tqdm", type=("build", "run")) - depends_on("py-joblib", type=("build", "run")) - depends_on("py-datalad", type=("build", "run")) - depends_on("py-imageio", type=("build", "run")) depends_on("py-fracridge", type=("build", "run")) - depends_on("py-nibabel", when="@main", type=("build", "run")) - depends_on("py-h5py", when="@main", type=("build", "run")) + depends_on("py-nibabel", when="@1.1:", type=("build", "run")) + depends_on("py-h5py", when="@1.1:", type=("build", "run")) + + with when("@:1.0"): + depends_on("py-twine", type=("build", "run")) + depends_on("py-sphinx", type=("build", "run")) + depends_on("py-seaborn", type=("build", "run")) + depends_on("py-pybids@0.8.0", type=("build", "run")) + depends_on("py-duecredit", type=("build", "run")) + depends_on("py-ww", type=("build", "run")) + depends_on("py-numba", type=("build", "run")) + depends_on("py-joblib", type=("build", "run")) + depends_on("py-datalad", type=("build", "run")) + depends_on("py-imageio", type=("build", "run")) -- cgit v1.2.3-70-g09d2