From efe8f75cf89b55850144627ae00b6a3f3f8fe66e Mon Sep 17 00:00:00 2001 From: Renan Oliveira Shimoura <r.shimoura@fz-juelich.de> Date: Tue, 9 Apr 2024 12:15:22 +0200 Subject: [PATCH 1/8] feat(wf-multi-area-model): remove py-python-louvain dependency --- packages/wf-multi-area-model/package.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/wf-multi-area-model/package.py b/packages/wf-multi-area-model/package.py index bdfc5a54..c875e17a 100644 --- a/packages/wf-multi-area-model/package.py +++ b/packages/wf-multi-area-model/package.py @@ -11,7 +11,7 @@ class WfMultiAreaModel(Package): homepage="https://inm-6.github.io/multi-area-model/" git = "https://github.com/INM-6/multi-area-model" - maintainer = ["terhorstd", "didi-hou"] + maintainer = ["terhorstd", "didi-hou", "rshimoura"] version("1.1.1", tag="v1.1.1") version("1.1.0", tag="v1.1.0") @@ -28,7 +28,6 @@ class WfMultiAreaModel(Package): depends_on("py-elephant", type=("run", "test")) depends_on("r-aod", type=("run", "test")) depends_on("py-notebook", type=("run", "test")) - depends_on("py-python-louvain", type=("run", "test")) def install(self, spec, prefix): install_tree(".", join_path(prefix, "notebooks")) -- GitLab From 0e51d7a35914a15fb919e23ea6e3fea149bd7d7c Mon Sep 17 00:00:00 2001 From: Andrew Davison <andrew.davison@cnrs.fr> Date: Thu, 11 Apr 2024 14:58:47 +0200 Subject: [PATCH 2/8] feat(py-neo): add version 0.13.0 --- packages/py-neo/package.py | 1 + spack.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/py-neo/package.py b/packages/py-neo/package.py index dd3d5b2f..3a23b72f 100644 --- a/packages/py-neo/package.py +++ b/packages/py-neo/package.py @@ -16,6 +16,7 @@ class PyNeo(PythonPackage): maintainers = ["apdavison"] + version('0.13.0', sha256='5675d1fa381a53c2c7eeb8b5e929ec0399de20bb0b52453e1b99ec6d66dc91f3') version('0.12.0', sha256='3b6ca4fc05dfdb4e953e253e70994bfbbc8fe2e90958fbda7fa5860caf3fa63a') version('0.11.1', sha256='f4a206044b332ad00b10072b0dc7a70b359fa365ec786f92ab757ef4ae588474') version('0.11.0', sha256='cdf8e1324a3fbbd1efd5618dcd37cfc497b1997923bd710b598472c1d846674a') diff --git a/spack.yaml b/spack.yaml index 0bdb1d1b..8c4e8377 100644 --- a/spack.yaml +++ b/spack.yaml @@ -34,7 +34,7 @@ spack: - py-lfpykit@0.5.1 - py-libneuroml@0.4.1 - py-libsonata@0.1.23 - - py-neo@0.12.0 + - py-neo@0.13.0 - py-nestml@7.0.1rc1 - py-netpyne@1.0.5 - py-neurom@3.2.2 -- GitLab From 6ee2a8b938d576df3e27d0008e4e11bc6c0876f7 Mon Sep 17 00:00:00 2001 From: Moritz Kern <mo.kern@fz-juelich.de> Date: Thu, 11 Apr 2024 15:05:22 +0200 Subject: [PATCH 3/8] feat(py-elephant): add version 1.1.0 --- packages/py-elephant/package.py | 7 +++++-- spack.yaml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/py-elephant/package.py b/packages/py-elephant/package.py index 7a6bb1ca..92fbf00d 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") @@ -59,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") @@ -68,7 +70,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") 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 fb34cac1163c1a508845d418d6fc02a4f4e26db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de> Date: Fri, 12 Apr 2024 09:33:43 +0200 Subject: [PATCH 4/8] feat(BSS): update wf-brainscales2-demos --- packages/wf-brainscales2-demos/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wf-brainscales2-demos/package.py b/packages/wf-brainscales2-demos/package.py index 914fa180..452f1a6d 100644 --- a/packages/wf-brainscales2-demos/package.py +++ b/packages/wf-brainscales2-demos/package.py @@ -17,6 +17,7 @@ class WfBrainscales2Demos(Package): maintainer = ["muffgaga"] # ECM: we probably should build the ipynb file in this package + version("8.0-a4", tag="jupyter-notebooks-8.0-a4") version("7.0-rc1-fixup3", tag="jupyter-notebooks-7.0-rc1-fixup3") version("23.6", branch="jupyter-notebooks-experimental") -- GitLab From 643203f3b5db337c09d42fdb882d672d02b26269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de> Date: Fri, 12 Apr 2024 09:33:54 +0200 Subject: [PATCH 5/8] feat(BSS): enable current version of wf-brainscales2-demos --- spack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index 634dcb59..e6fb7dc1 100644 --- a/spack.yaml +++ b/spack.yaml @@ -61,7 +61,7 @@ spack: - sda@7.3.3d # Workflows (meta-packages) - wf-biobb - - wf-brainscales2-demos@7.0-rc1-fixup3 + - wf-brainscales2-demos@8.0-a4 - wf-protein-association-rates@0.1 - wf-multi-area-model@1.1.1 - wf-uq-akar4@0.1 -- GitLab From 36936038e44f640153adda4f0985eec7afacc4ea Mon Sep 17 00:00:00 2001 From: Dennis Terhorst <d.terhorst@fz-juelich.de> Date: Fri, 12 Apr 2024 18:01:50 +0200 Subject: [PATCH 6/8] feat(nest): add version 3.7 --- packages/nest/package.py | 2 +- spack.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nest/package.py b/packages/nest/package.py index e1593d4b..4330c7bb 100644 --- a/packages/nest/package.py +++ b/packages/nest/package.py @@ -28,7 +28,7 @@ class Nest(CMakePackage): maintainers = ['terhorst'] version('master', branch='master') - version('3.7_rc1', sha256='6f5948ac717d4b66c84ed53ba5c9b0e44e4e9cc3c1f3d15d8d8f21024313061e') + version('3.7', sha256='e1fb8dc4724887a3a2bfbaa9e86f2ef1d458a4535f8c54e328c4dcb3bc426d40') version('3.6', sha256='68d6b11791e1284dc94fef35d84c08dd7a11322c0f1e1fc9b39c5e6882284922') patch('nest-simulator-3.6-p1-CxxRealPath.patch', when='@3.6') version('3.5', sha256='3cdf5720854a4d8a7d359f9de9d2fb3619a0be2e36932028d6940360741547bd') diff --git a/spack.yaml b/spack.yaml index e6fb7dc1..3c49e88f 100644 --- a/spack.yaml +++ b/spack.yaml @@ -13,7 +13,7 @@ spack: - biobb-structure-checking@3.12.1 - biobb-structure-utils@4.0.0 - hxtorch@8.0-a4 - - nest@3.7_rc1 +sonata + - nest@3.7 +sonata - neuron@8.2.3 +mpi - jaxsnn@8.0-a4 - py-bluepyefe@2.2.18 -- GitLab From b8a4fe01c512d51f7aab25d7f9a384856c2c6d65 Mon Sep 17 00:00:00 2001 From: Dennis Terhorst <d.terhorst@fz-juelich.de> Date: Sat, 13 Apr 2024 12:32:01 +0200 Subject: [PATCH 7/8] fix(nest): fix sha256 of nest@3.7 --- packages/nest/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nest/package.py b/packages/nest/package.py index 4330c7bb..835c566a 100644 --- a/packages/nest/package.py +++ b/packages/nest/package.py @@ -28,7 +28,7 @@ class Nest(CMakePackage): maintainers = ['terhorst'] version('master', branch='master') - version('3.7', sha256='e1fb8dc4724887a3a2bfbaa9e86f2ef1d458a4535f8c54e328c4dcb3bc426d40') + version('3.7', sha256='b313e03aa05a0d8053b895a1d14ea42e75805393c6daa0cbc62f9398d0dacd8b') version('3.6', sha256='68d6b11791e1284dc94fef35d84c08dd7a11322c0f1e1fc9b39c5e6882284922') patch('nest-simulator-3.6-p1-CxxRealPath.patch', when='@3.6') version('3.5', sha256='3cdf5720854a4d8a7d359f9de9d2fb3619a0be2e36932028d6940360741547bd') -- GitLab From 62d65e695ba5dbc83706d1f9e762f39ffa5e59e2 Mon Sep 17 00:00:00 2001 From: Charl Linssen <c.linssen@fz-juelich.de> Date: Sat, 13 Apr 2024 18:20:50 +0200 Subject: [PATCH 8/8] feat(py-nestml): add version 7.0.1 --- packages/py-nestml/package.py | 6 +++--- spack.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/py-nestml/package.py b/packages/py-nestml/package.py index f071ca22..5983800e 100644 --- a/packages/py-nestml/package.py +++ b/packages/py-nestml/package.py @@ -13,12 +13,12 @@ class PyNestml(PythonPackage): """ homepage = 'https://nestml.readthedocs.org/' - url = 'https://pypi.org/packages/py3/N/NESTML/NESTML-7.0.1rc1-py3-none-any.whl' + url = 'https://pypi.org/packages/py3/N/NESTML/NESTML-7.0.1-py3-none-any.whl' git = 'https://github.com/nest/nestml/' - maintainers = ['clinssen', 'pnbabu', 'jougs'] + maintainers = ['clinssen', 'pnbabu'] - version('7.0.1rc1', sha256='80a0d66b747424a1f8ee88496c8bb3954db20be570d0dc2d58988b63794a6491', expand=False) + version('7.0.1', sha256='38392bdd06c5be5af65050153f34fb78dee6032158b268b83599bd70aab5c030', expand=False) version('7.0.0', sha256='4e271048b4a9ad2c161dda98d3ee25e143537649a264d521deb0ff5543020d73', expand=False) version('6.0.0', sha256='224993f175b9599a3662e65afdaf57e355246c0eab5f88b795fdb089ea28b39e', expand=False) version('5.3.0', sha256='8de543d7d3a166cd4d6a0d536a2d4e769513bbf8d7aeaf64458e9d9c21fe546e', expand=False) diff --git a/spack.yaml b/spack.yaml index 3c49e88f..b697a1d0 100644 --- a/spack.yaml +++ b/spack.yaml @@ -35,7 +35,7 @@ spack: - py-libneuroml@0.4.1 - py-libsonata@0.1.23 - py-neo@0.13.0 - - py-nestml@7.0.1rc1 + - py-nestml@7.0.1 - py-netpyne@1.0.5 - py-neurom@3.2.2 - py-neuror@1.6.4 -- GitLab