From e1be70976358786d1b5f3655bb0dfb7c735ebf3d Mon Sep 17 00:00:00 2001
From: "C.A.P. Linssen" <charl@turingbirds.com>
Date: Thu, 5 Oct 2023 06:40:06 -0700
Subject: [PATCH 1/5] add new NESTML version
---
packages/py-nestml/package.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/py-nestml/package.py b/packages/py-nestml/package.py
index 7e3329d5..aa061d53 100644
--- a/packages/py-nestml/package.py
+++ b/packages/py-nestml/package.py
@@ -18,10 +18,12 @@ class PyNestml(PythonPackage):
maintainers = ['clinssen', 'pnbabu', 'jougs']
+ version('6.0.0', sha256='224993f175b9599a3662e65afdaf57e355246c0eab5f88b795fdb089ea28b39e', expand=False)
version('5.3.0', sha256='8de543d7d3a166cd4d6a0d536a2d4e769513bbf8d7aeaf64458e9d9c21fe546e', expand=False)
version('5.2.0', sha256='acb703bf9c7f70304bd5d547dccd6a6a219f8acb298a6412df779b808241eb14', expand=False)
- depends_on('python@3.8:', type=('build', 'run'))
+ depends_on('python@3.8:', when="@:5.3" type=('build', 'run'))
+ depends_on('python@3.9:', when="@5.3:" type=('build', 'run'))
depends_on('py-pip', type='build')
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
--
GitLab
From 6bf152055867011ab0bd291eb66fe2bf787ab9b2 Mon Sep 17 00:00:00 2001
From: "C.A.P. Linssen" <charl@turingbirds.com>
Date: Thu, 5 Oct 2023 06:41:18 -0700
Subject: [PATCH 2/5] add new ODE-toolbox version
---
packages/py-odetoolbox/package.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/py-odetoolbox/package.py b/packages/py-odetoolbox/package.py
index 0f8265d1..e32a5ea2 100644
--- a/packages/py-odetoolbox/package.py
+++ b/packages/py-odetoolbox/package.py
@@ -12,6 +12,7 @@ class PyOdetoolbox(PythonPackage):
maintainers = ['clinssen']
+ version('2.5.4', sha256='eadb8f42a553cb34180a11d96cbac49ec4d0f07caf0358e066ab63415746e009', expand=False)
version('2.5', sha256='947bbb289830dde60066106f5f628de2598a71129eafff8ec86317a0b5e8960e', expand=False)
depends_on('python@3.8:', type=('build', 'run'))
--
GitLab
From ef3377e99b2cabfa5715c7d41bb61c22f95ff8d8 Mon Sep 17 00:00:00 2001
From: "C.A.P. Linssen" <charl@turingbirds.com>
Date: Thu, 5 Oct 2023 07:05:57 -0700
Subject: [PATCH 3/5] update NESTML version in spack package list
---
spack.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spack.yaml b/spack.yaml
index 94e3dbd6..f599072f 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -33,7 +33,7 @@ spack:
- py-lfpykit@0.5.1
- py-libsonata@0.1.23
- py-neo@0.12.0
- - py-nestml@5.3.0
+ - py-nestml@6.0.0
- py-netpyne@1.0.5
- py-neurom@3.2.2
- py-neuror@1.6.4
--
GitLab
From fd42b3ec9eb700e596a270b46374f67410ce75e2 Mon Sep 17 00:00:00 2001
From: "C.A.P. Linssen" <charl@turingbirds.com>
Date: Thu, 5 Oct 2023 07:11:42 -0700
Subject: [PATCH 4/5] add new NESTML version
---
packages/py-nestml/package.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/py-nestml/package.py b/packages/py-nestml/package.py
index aa061d53..03fd0f21 100644
--- a/packages/py-nestml/package.py
+++ b/packages/py-nestml/package.py
@@ -22,8 +22,8 @@ class PyNestml(PythonPackage):
version('5.3.0', sha256='8de543d7d3a166cd4d6a0d536a2d4e769513bbf8d7aeaf64458e9d9c21fe546e', expand=False)
version('5.2.0', sha256='acb703bf9c7f70304bd5d547dccd6a6a219f8acb298a6412df779b808241eb14', expand=False)
- depends_on('python@3.8:', when="@:5.3" type=('build', 'run'))
- depends_on('python@3.9:', when="@5.3:" type=('build', 'run'))
+ depends_on('python@3.8:', when='@:5.3', type=('build', 'run'))
+ depends_on('python@3.9:', when='@6.0.0:', type=('build', 'run'))
depends_on('py-pip', type='build')
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
--
GitLab
From 37b7a4fd4e2407dfdb9dc8e1f3fd61075ec6fa87 Mon Sep 17 00:00:00 2001
From: "C.A.P. Linssen" <charl@turingbirds.com>
Date: Thu, 5 Oct 2023 07:48:08 -0700
Subject: [PATCH 5/5] update NESTML and ODE-toolbox version in spack package
list
---
packages/py-nestml/package.py | 3 +--
packages/py-odetoolbox/package.py | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/packages/py-nestml/package.py b/packages/py-nestml/package.py
index 03fd0f21..d2010ea0 100644
--- a/packages/py-nestml/package.py
+++ b/packages/py-nestml/package.py
@@ -22,8 +22,7 @@ class PyNestml(PythonPackage):
version('5.3.0', sha256='8de543d7d3a166cd4d6a0d536a2d4e769513bbf8d7aeaf64458e9d9c21fe546e', expand=False)
version('5.2.0', sha256='acb703bf9c7f70304bd5d547dccd6a6a219f8acb298a6412df779b808241eb14', expand=False)
- depends_on('python@3.8:', when='@:5.3', type=('build', 'run'))
- depends_on('python@3.9:', when='@6.0.0:', type=('build', 'run'))
+ depends_on('python@3.8:', type=('build', 'run'))
depends_on('py-pip', type='build')
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-scipy', type=('build', 'run'))
diff --git a/packages/py-odetoolbox/package.py b/packages/py-odetoolbox/package.py
index e32a5ea2..afb8fe4c 100644
--- a/packages/py-odetoolbox/package.py
+++ b/packages/py-odetoolbox/package.py
@@ -21,7 +21,6 @@ class PyOdetoolbox(PythonPackage):
depends_on('py-scipy', type=('build', 'run'))
depends_on('py-numpy@1.8.2:', type=('build', 'run'))
depends_on('py-cython', type=('build', 'run'))
- depends_on('py-graphviz', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-pytest', type='test')
--
GitLab