From 0a4d4da5ce6c29954a1c1d659186c6aa457d8a58 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Fri, 12 May 2023 17:32:12 +0200 Subject: py-rsatoolbox: add 0.0.5, 0.1.0 and 0.1.2 (#37595) * py-rsatoolbox: add 0.0.5, 0.1.0 and 0.1.2 from wheels * py-setuptools: add 63.4.3 * remove wheels and open up requirements * Fix style * Update var/spack/repos/builtin/packages/py-rsatoolbox/package.py Co-authored-by: Adam J. Stewart * Update var/spack/repos/builtin/packages/py-rsatoolbox/package.py Co-authored-by: Adam J. Stewart * Change version for python restriction --------- Co-authored-by: Adam J. Stewart --- .../builtin/packages/py-rsatoolbox/package.py | 24 +++++++++++++++++----- .../builtin/packages/py-setuptools/package.py | 5 +++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-rsatoolbox/package.py b/var/spack/repos/builtin/packages/py-rsatoolbox/package.py index ce14c336f9..2f25895d57 100644 --- a/var/spack/repos/builtin/packages/py-rsatoolbox/package.py +++ b/var/spack/repos/builtin/packages/py-rsatoolbox/package.py @@ -14,21 +14,35 @@ class PyRsatoolbox(PythonPackage): git = "https://github.com/rsagroup/rsatoolbox.git" version("main", branch="main") + version("0.1.2", sha256="2d091cbaa33373bf9da4df5ca8d127f0e427431a3db726076090ab2d54fe1213") + version("0.1.0", sha256="245f909d31909ba896b765fa51ea019510dd690c6bb8d04b178a9c76ec36dce9") + version("0.0.5", sha256="7ede9309755a6173c26f08fd36fa436a11993c7ae0fa9fce05f38be7af0dc6eb") version("0.0.4", sha256="84153fa4c686c95f3e83f2cb668b97b82b53dc2a565856db80aa5f8c96d09359") version("0.0.3", sha256="9bf6e16d9feadc081f9daaaaab7ef38fc1cd64dd8ef0ccd9f74adb5fe6166649") + depends_on("python@:3.10", when="@:0.1.2", type=("build", "run")) + + # version restriction from pyproject.toml cannot be concretized at the + # moment but package also builds with older versions depends_on("py-setuptools", type="build") - depends_on("py-coverage", type=("build", "run")) + depends_on("py-setuptools-scm+toml@7.0", when="@0.0.5:", type="build") + # version restriction: same as for py-setuptools + depends_on("py-cython", when="@0.0.5:", type="build") + depends_on("py-twine@4.0.1:4.0", when="@0.0.5:", type="build") + depends_on("py-numpy@1.21.2:", type=("build", "run")) depends_on("py-scipy", type=("build", "run")) depends_on("py-scikit-learn", type=("build", "run")) depends_on("py-scikit-image", type=("build", "run")) - depends_on("py-tqdm", type=("build", "run")) - depends_on("py-h5py", type=("build", "run")) + depends_on("py-pandas", when="@0.0.4:", type=("build", "run")) depends_on("py-matplotlib", type=("build", "run")) + depends_on("py-h5py", type=("build", "run")) + depends_on("py-tqdm", type=("build", "run")) depends_on("py-joblib", type=("build", "run")) - depends_on("py-petname@2.2", when="@0.0.4:", type=("build", "run")) - depends_on("py-pandas", when="@0.0.4:", type=("build", "run")) + + # old dependcies + depends_on("py-coverage", when="@:0.1.1", type=("build", "run")) + depends_on("py-petname@2.2", when="@0.0.4", type=("build", "run")) @when("@:0.0.3") def patch(self): diff --git a/var/spack/repos/builtin/packages/py-setuptools/package.py b/var/spack/repos/builtin/packages/py-setuptools/package.py index 6fa0fee5cd..0d10ffb5f9 100644 --- a/var/spack/repos/builtin/packages/py-setuptools/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools/package.py @@ -34,6 +34,11 @@ class PySetuptools(Package, PythonExtension): sha256="63f463b90ff5e0a1422010100268fd688e15c44ae0798659013c8412963e15e4", expand=False, ) + version( + "63.4.3", + sha256="7f61f7e82647f77d4118eeaf43d64cbcd4d87e38af9611694d4866eb070cd10d", + expand=False, + ) version( "63.0.0", sha256="045aec56a3eee5c82373a70e02db8b6da9a10f7faf61ff89a14ab66c738ed370", -- cgit v1.2.3-60-g2f50