Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix pipeline issue with pygsl and numpy v2 #232

Merged
merged 18 commits into from
Jun 19, 2024
Merged

Fix pipeline issue with pygsl and numpy v2 #232

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
29adbb2
Merge build and deploy to fix deploy problems
steffengraber Feb 9, 2024
3d52979
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 7, 2024
e1cfa85
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 8, 2024
d63f2f4
Merge remote-tracking branch 'upstream/master'
steffengraber Mar 26, 2024
ab7e910
Merge remote-tracking branch 'upstream/master'
steffengraber Apr 4, 2024
1adf82e
Add nest-server requirements
steffengraber Apr 4, 2024
5301617
Fix nest-desktop and compose file
steffengraber Apr 4, 2024
c384fb0
Add v3.7
steffengraber Apr 12, 2024
93b1397
Merge branch 'fix-nest-server'
steffengraber Apr 12, 2024
a52208a
Merge remote-tracking branch 'upstream/master'
steffengraber Apr 15, 2024
d01ede0
Remove test
steffengraber Apr 19, 2024
fa70bbb
Add v3.7 to readme
steffengraber Apr 19, 2024
fe3ca17
Merge remote-tracking branch 'upstream/master'
steffengraber May 15, 2024
52d7575
Fix nestml version and add pygsl
steffengraber May 15, 2024
5fd6274
Merge remote-tracking branch 'upstream/master'
steffengraber Jun 17, 2024
621edd0
Set pygsl to fix version
steffengraber Jun 17, 2024
779f4eb
Fix pygsl problems with numpy v2
steffengraber Jun 19, 2024
2c09fb5
Merge branch 'master' into fix-pipeline
steffengraber Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/3.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
python3-jupyter-core \
python3-mpi4py \
python3-nose \
python3-numpy \
python3-pandas \
python3-path \
python3-pip \
Expand Down Expand Up @@ -91,7 +90,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
wget "https://github.com/nest/nest-simulator/archive/refs/tags/v${NEST_VERSION}.tar.gz" -P ${SRC_PATH} && \
tar -xzf v${NEST_VERSION}.tar.gz && \
python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/doc/requirements.txt && \
python3 -m pip install sphinx_gallery==0.10.1 && \
python3 -m pip install sphinx_gallery==0.10.1 numpy<2.0dev0 && \
chmod +x ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \
${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \
mkdir ${SRC_PATH}/nest-build && cd $_ && \
Expand All @@ -113,13 +112,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
${SRC_PATH}/nest-simulator-${NEST_VERSION} && \
make && \
make install && \
python3 -m pip install --upgrade pip && \
python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_testing.txt && \
python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_nest_server.txt && \
python3 -m pip install pygsl==2.3.3 && \
python3 -m pip install --upgrade pip setuptools wheel && \
python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements.txt && \
python3 -m pip install --upgrade numpy<2.0dev0 && \
python3 -m pip install --upgrade nest-desktop && \
python3 -m pip install --upgrade nestml && \
python3 -m pip install --force-reinstall --upgrade scipy
python3 -m pip install --upgrade scipy && \
python3 -m pip install --upgrade pygsl

COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh
Expand Down