From e7b46aa41fa97f758ec9dbc6379b64c75c8af41e Mon Sep 17 00:00:00 2001 From: Moritz-Alexander-Kern <92092328+Moritz-Alexander-Kern@users.noreply.github.com> Date: Wed, 10 Apr 2024 17:09:31 +0200 Subject: [PATCH 1/3] Update py-elephant to 1.1.0 --- packages/py-elephant/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/py-elephant/package.py b/packages/py-elephant/package.py index 7a6bb1ca..6ad7c91a 100644 --- a/packages/py-elephant/package.py +++ b/packages/py-elephant/package.py @@ -16,6 +16,7 @@ class PyElephant(PythonPackage, CudaPackage): maintainers = ["moritzkern"] version('develop', branch='master') + version("1.1.0", sha256="4085a8fcac3ab855f2585d017d17a1589c74adfbd930f7a1e012f2f5bd994e71") version("1.0.0", sha256="b1471228821a5b8f3a3137f9facc1a7f2dc355b8e3300490bdc05f0466b80b27") version("0.14.0", sha256="02ce3b2a8d08dc19828f95384551339ea0946bc405c1db9aace54135417c2b0f") version("0.13.0", sha256="2c6463cf9ace41631f2af196c5b80b468bf1c4b264d3a6b1ea0fb587d9e7dd67") @@ -68,7 +69,8 @@ class PyElephant(PythonPackage, CudaPackage): depends_on("py-quantities@0.12.1:0.13.0", type=("build", "run"), when="@0.6.4:0.11.2") depends_on("py-quantities@0.14.1:", type=("build", "run"), when="@develop") depends_on("py-quantities@0.14.1:", type=("build", "run"), when="@0.12.0:") - depends_on("py-scipy@1.5.4:", type=("build", "run"), when="@0.6.4:") + depends_on("py-scipy@1.5.4:", type=("build", "run"), when="@0.6.4:1.0.0") + depends_on("py-scipy@1.10.0:", type=("build", "run"), when="@1.1.0:") depends_on("py-six@1.10.0:", type=("build", "run"), when="@0.6.4:") depends_on("py-tqdm", type=("build", "run"), when="@0.6.4:") depends_on("py-pycuda", type=("build", "run"), when="@0.10.0:+cuda") -- GitLab From eb6e3256b4f8c1102c87ce264812db22df142d49 Mon Sep 17 00:00:00 2001 From: Eleni Mathioulaki <emathioulaki@athenarc.gr> Date: Wed, 10 Apr 2024 18:01:26 +0200 Subject: [PATCH 2/3] enable new version of py-elephant --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 8c4e8377..634dcb59 100644 --- a/spack.yaml +++ b/spack.yaml @@ -23,7 +23,7 @@ spack: - py-ebrains-drive@0.5.1 - py-ebrains-kg-core@0.9.15 - py-efel@4.0.4 - - py-elephant@1.0.0 + - py-elephant@1.1.0 - py-fairgraph@0.11.1 - py-frites@0.4.4 - py-hbp-archive@1.1.1 -- GitLab From 58026c95cd8a834fb1f49eea4e0af77a51c75df5 Mon Sep 17 00:00:00 2001 From: Moritz-Alexander-Kern <92092328+Moritz-Alexander-Kern@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:40:45 +0200 Subject: [PATCH 3/3] add requirement for neo>0.13.0 --- packages/py-elephant/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/py-elephant/package.py b/packages/py-elephant/package.py index 6ad7c91a..92fbf00d 100644 --- a/packages/py-elephant/package.py +++ b/packages/py-elephant/package.py @@ -60,7 +60,8 @@ class PyElephant(PythonPackage, CudaPackage): depends_on("py-scikit-learn@0.23.2:", type=("build", "run"), when="+extras") depends_on("py-statsmodels@0.12.1:", type=("build", "run"), when="+extras") depends_on("py-jinja2@2.11.2:", type=("build", "run"), when="+extras") - depends_on("py-neo@0.10.0:", type=("build", "run"), when="@0.11.0:") + depends_on("py-neo@0.10.0:", type=("build", "run"), when="@0.11.0:1.0.0") + depends_on("py-neo@0.13.0:", type=("build", "run"), when="@0.11.0:1.1.0") depends_on("py-neo@0.9.0", type=("build", "run"), when="@0.9.0:0.10.0") depends_on("py-neo@0.8.0", type=("build", "run"), when="@0.6.4:0.8.0") depends_on("py-numpy@1.18.1:1.23.5", type=("build", "run"), when="@0.6.4:0.11.2") -- GitLab