diff --git a/Dockerfile b/Dockerfile index 9a662c5..8cb71b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,12 +59,15 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ chaste-dependencies \ xvfb \ - # python3-matplotlib \ - # python3-notebook \ - # python3-numpy \ - # python3-petsc4py \ + python3-jupyterlab \ + python3-matplotlib \ + python3-numpy \ + python3-petsc4py \ + python3-pip \ + python3-venv \ python3-vtk9 \ - # python3-xvfbwrapper \ + python3-xvfbwrapper \ + castxml \ clang \ lldb \ gdb \ diff --git a/scripts/build_chaste.sh b/scripts/build_chaste.sh index dd63c27..b5a9a31 100755 --- a/scripts/build_chaste.sh +++ b/scripts/build_chaste.sh @@ -50,22 +50,17 @@ cmake -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} \ -H$CHASTE_SOURCE_DIR \ -B$CHASTE_BUILD_DIR -# make --no-print-directory -j$NCORES -C $CHASTE_BUILD_DIR # -f $CHASTE_BUILD_DIR/Makefile +make --no-print-directory -j$NCORES -C $CHASTE_BUILD_DIR # -f $CHASTE_BUILD_DIR/Makefile if [ "$Chaste_ENABLE_PYCHASTE" = "ON" ]; then - # Build and install PyChaste - echo "Building PyChaste..." - # make --no-print-directory -j$NCORES -C $CHASTE_BUILD_DIR - make --no-print-directory -j$NCORES -C $CHASTE_BUILD_DIR pychaste - python -m pip install --no-cache-dir --user numpy matplotlib petsc4py jupyterlab xvfbwrapper - # python -m pip install --no-cache-dir --user --no-deps pychaste/package - python -m pip install --no-cache-dir --user --no-deps $CHASTE_BUILD_DIR/pychaste/package + # Install PyChaste + echo "Installing PyChaste..." + PIP_BREAK_SYSTEM_PACKAGES=1 python3 -m pip install -v --no-cache-dir --user $CHASTE_BUILD_DIR/pychaste/package # Test PyChaste # xvfb-run --server-args="-screen 0 1024x768x24" ctest -L pychaste else echo "PyChaste is not enabled." - make --no-print-directory -j$NCORES -C $CHASTE_BUILD_DIR # -f $CHASTE_BUILD_DIR/Makefile fi # Save the build info