diff --git a/python-requirements/install.sh b/python-requirements/install.sh index bb7fb76..de40fb1 100755 --- a/python-requirements/install.sh +++ b/python-requirements/install.sh @@ -72,15 +72,6 @@ else CC="mpicc" ${PREFIX}/bin/python2.7 ${PREFIX}/bin/pip install ${PIPOPTS} --upgrade --index-url=http://pypi.python.org/simple/ --trusted-host pypi.python.org -r requirements.txt fi -# Force reinstall -#${PREFIX}/bin/python ${PREFIX}/bin/pip install ${PIPOPTS} --upgrade --no-deps --force-reinstall --index-url=http://pypi.python.org/simple/ --trusted-host pypi.python.org -r requirements.txt -# Install notebook -${PREFIX}/bin/python2.7 ${PREFIX}/bin/pip install ${PIPOPTS} --upgrade --index-url=http://pypi.python.org/simple/ --trusted-host pypi.python.org -r notebook-requirements.txt - -${PREFIX}/bin/python2.7 ${PREFIX}/bin/pip install ${PIPOPTS} --upgrade --index-url=http://pypi.python.org/simple/ --trusted-host pypi.python.org jupyter - -${PREFIX}/bin/python2.7 ${PREFIX}/bin/pip install ${PIPOPTS} --upgrade --index-url=http://pypi.python.org/simple/ --trusted-host pypi.python.org jupyter_contrib_nbextensions - # If CUDA present install pycuda #if [ -f "$CUDA_COMPILER" ]; then # install/bin/python install/bin/pip install ${PIPOPTS} pycuda diff --git a/python-requirements/notebook-requirements.txt b/python-requirements/notebook-requirements.txt index 5df524d..0a498dd 100644 --- a/python-requirements/notebook-requirements.txt +++ b/python-requirements/notebook-requirements.txt @@ -5,6 +5,7 @@ backports.shutil-get-terminal-size==1.0.0 pickleshare==0.7.4 simplegeneric==0.8.1 jupyter==1.0.0 +jupyter_contrib_nbextensions scipy==0.19.1 # On Macs may need to comment out /usr/X11/include/freetype2 before compiling matplotlib matplotlib==2.1.0 diff --git a/python-requirements/requirements.txt b/python-requirements/requirements.txt index b997183..f3037fc 100644 --- a/python-requirements/requirements.txt +++ b/python-requirements/requirements.txt @@ -16,3 +16,4 @@ junit_xml==1.8 voluptuous==0.10.5 h5py==2.7.1 netCDF4==1.3.0 +-rnotebook-requirements.txt