Skip to content

Commit

Permalink
Fix pip install of packages in requirement file (#239)
Browse files Browse the repository at this point in the history
* 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

* Quick fix to issue with requirements file installation
  • Loading branch information
steffengraber authored Jul 18, 2024
1 parent 25919b7 commit c484254
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
9 changes: 8 additions & 1 deletion src/3.8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
cd ${SRC_PATH} && \
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 && \
# Installing the requirements_docs.txt stops at some time with an error
# Installing every package fix it.
python3 -m pip install sphinx>=6.2.1 sphinx_rtd_theme sphinx_autobuild sphinx_gallery sphinx-tabs && \
python3 -m pip install sphinx_design sphinx-material sphinx-copybutton sphinx-carousel && \
python3 -m pip install sphinx-notfound-page sphinxcontrib-mermaid sphinxcontrib-plantuml nbsphinx && \
python3 -m pip install numpydoc example Image breathe csvkit docutils PyYAML>=4.2b1 tqdm yamllint && \
# RUN python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_docs.txt
python3 -m pip install sphinx_gallery==0.10.1 'numpy<=1.26' && \
chmod +x ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \
${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \
Expand Down Expand Up @@ -119,6 +125,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
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 https://api.github.com/repos/nest/nestml/zipball/pull/1087/head

# python3 -m pip install nestml==8.0.0rc1 && \
Expand Down
19 changes: 13 additions & 6 deletions src/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,23 @@ RUN python3 -m pip install --upgrade pip setuptools wheel mock
RUN python3 -m pip install --force-reinstall --upgrade --no-binary=h5py h5py
RUN ldconfig



# Download NEST
RUN cd ${SRC_PATH} && \
wget https://github.com/nest/nest-simulator/archive/refs/heads/${NEST_VERSION}.tar.gz -P ${SRC_PATH} && \
tar -xzf ${NEST_VERSION}.tar.gz
RUN python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/doc/requirements.txt && \
python3 -m pip install sphinx_gallery==0.10.1
# Install music

# Installing the requirements_docs.txt stops at some time with an error
# Installing every package fix it.
RUN python3 -m pip install sphinx>=6.2.1 sphinx_rtd_theme sphinx_autobuild sphinx_gallery sphinx-tabs
RUN python3 -m pip install sphinx_design sphinx-material sphinx-copybutton sphinx-carousel
RUN python3 -m pip install sphinx-notfound-page sphinxcontrib-mermaid sphinxcontrib-plantuml nbsphinx
RUN python3 -m pip install numpydoc example Image breathe csvkit docutils PyYAML>=4.2b1 tqdm yamllint

# RUN python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_docs.txt

RUN python3 -m pip install sphinx_gallery==0.10.1

# Install music
RUN chmod +x ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \
${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh

Expand Down Expand Up @@ -136,7 +144,6 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \

# Install NESTML and more
RUN python3 -m pip install --upgrade pip && \
python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements.txt && \
python3 -m pip install nest-desktop --pre && \
python3 -m pip uninstall nestml -y && \
python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/heads/master.zip && \
Expand Down

0 comments on commit c484254

Please sign in to comment.