From 5e4a4ed7ce90ce2b504b504a7db7c6a2a89aedcb Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Thu, 24 Oct 2024 12:27:13 +0200 Subject: [PATCH 1/3] Fix problem with the numpy installation (#249) * Merge build and deploy to fix deploy problems * Add nest-server requirements * Fix nest-desktop and compose file * Add v3.7 * Remove test * Add v3.7 to readme * Fix nestml version and add pygsl * Install nestml fix for nest verssion * Fix merging errors * Deactivate build of 3.7 and 2.20.2 in CI * Add rc2 * NEW Version 3.8 * Fix the mermaid installation with a patch and fix some doubles * Fix numpy installation --- src/3.8/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3.8/Dockerfile b/src/3.8/Dockerfile index 005c03c..088f3ee 100644 --- a/src/3.8/Dockerfile +++ b/src/3.8/Dockerfile @@ -61,7 +61,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python3-jupyter-core \ python3-mpi4py \ python3-nose \ - python3-pandas \ python3-path \ python3-pip \ python3-pytest \ @@ -127,7 +126,8 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \ #Latest update to nestml v8.0.0-rc1 RUN python3 -m pip install nestml==8.0.0rc2 && \ python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b6 && \ - python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/pygsl@v2.4.0 + python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/pygsl@v2.4.0 && \ + python3 -m pip install pandas "numpy<=1.26" COPY entrypoint.sh /usr/local/bin/entrypoint.sh RUN chmod +x /usr/local/bin/entrypoint.sh From 3680a38b525193f891cd0a9c008f71d8903c1248 Mon Sep 17 00:00:00 2001 From: Steffen Graber Date: Wed, 27 Nov 2024 15:49:22 +0100 Subject: [PATCH 2/3] Add NESTML v8.0.0rc3 (#250) * Add NESTML v8.0.0rc3 --- src/3.8/Dockerfile | 4 ++-- src/dev/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/3.8/Dockerfile b/src/3.8/Dockerfile index 088f3ee..29fc7a3 100644 --- a/src/3.8/Dockerfile +++ b/src/3.8/Dockerfile @@ -123,8 +123,8 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \ python3 -m pip install --upgrade scipy && \ python3 -m pip install --upgrade gsl wheel setuptools swig -#Latest update to nestml v8.0.0-rc1 -RUN python3 -m pip install nestml==8.0.0rc2 && \ +#Latest update to nestml v8.0.0-rc3 +RUN python3 -m pip install NESTML==8.0.0rc3 && \ python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b6 && \ python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/pygsl@v2.4.0 && \ python3 -m pip install pandas "numpy<=1.26" diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile index 34c082d..2de9589 100644 --- a/src/dev/Dockerfile +++ b/src/dev/Dockerfile @@ -129,8 +129,8 @@ python3 -m pip install --upgrade nest-desktop && \ python3 -m pip install --upgrade scipy && \ python3 -m pip install --upgrade gsl wheel setuptools swig -#Latest update to nestml v8.0.0-rc1 -RUN python3 -m pip install nestml==8.0.0rc2 && \ +#Latest update to nestml v8.0.0-rc3 +RUN python3 -m pip install nestml==8.0.0rc3 && \ python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b6 && \ python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/pygsl@v2.4.0 From c030f88fd549ecb202258958abdd8b4fbd2d63df Mon Sep 17 00:00:00 2001 From: Sebastian Spreizer Date: Tue, 10 Dec 2024 13:58:07 +0100 Subject: [PATCH 3/3] Ugrade nestml server (#251) --- src/dev/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile index 2de9589..4d970f8 100644 --- a/src/dev/Dockerfile +++ b/src/dev/Dockerfile @@ -131,11 +131,11 @@ python3 -m pip install --upgrade gsl wheel setuptools swig #Latest update to nestml v8.0.0-rc3 RUN python3 -m pip install nestml==8.0.0rc3 && \ -python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b6 && \ +python3 -m pip install nestml-server@git+https://github.com/babsey/nestml-server@v1.0-b8 && \ python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/pygsl@v2.4.0 COPY entrypoint.sh /usr/local/bin/entrypoint.sh -RUN chmod +x /usr/local/bin/entrypoint.sh +RUN chmod +x /usr/local/bin/entrypoint.sh COPY test-nest.sh /opt/test-nest.sh RUN chmod +x /opt/test-nest.sh