Merge pull request #307 from slarson/master

Add vincent, beautifulsoup, and xlrd to scipy-notebook
This commit is contained in:
Peter Parente
2016-11-30 00:29:17 -05:00
committed by GitHub
2 changed files with 9 additions and 3 deletions

View File

@@ -37,7 +37,10 @@ RUN conda install --quiet --yes \
'bokeh=0.11*' \ 'bokeh=0.11*' \
'sqlalchemy=1.0*' \ 'sqlalchemy=1.0*' \
'hdf5=1.8.17' \ 'hdf5=1.8.17' \
'h5py=2.6*' && \ 'h5py=2.6*' \
'vincent=0.4.*' \
'beautifulsoup4=4.5.*' \
'xlrd' && \
conda remove --quiet --yes --force qt pyqt && \ conda remove --quiet --yes --force qt pyqt && \
conda clean -tipsy conda clean -tipsy
@@ -69,7 +72,10 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \
'hdf5=1.8.17' \ 'hdf5=1.8.17' \
'h5py=2.6*' \ 'h5py=2.6*' \
'sqlalchemy=1.0*' \ 'sqlalchemy=1.0*' \
'pyzmq' && \ 'pyzmq' \
'vincent=0.4.*' \
'beautifulsoup4=4.5.*' \
'xlrd' && \
conda remove -n python2 --quiet --yes --force qt pyqt && \ conda remove -n python2 --quiet --yes --force qt pyqt && \
conda clean -tipsy conda clean -tipsy
# Add shortcuts to distinguish pip for python2 and python3 envs # Add shortcuts to distinguish pip for python2 and python3 envs

View File

@@ -6,7 +6,7 @@
* Jupyter Notebook 4.2.x * Jupyter Notebook 4.2.x
* Conda Python 3.x and Python 2.7.x environments * Conda Python 3.x and Python 2.7.x environments
* pandas, matplotlib, scipy, seaborn, scikit-learn, scikit-image, sympy, cython, patsy, statsmodel, cloudpickle, dill, numba, bokeh pre-installed * pandas, matplotlib, scipy, seaborn, scikit-learn, scikit-image, sympy, cython, patsy, statsmodel, cloudpickle, dill, numba, bokeh, vincent, beautifulsoup, xlrd pre-installed
* Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda` * Unprivileged user `jovyan` (uid=1000, configurable, see options) in group `users` (gid=100) with ownership over `/home/jovyan` and `/opt/conda`
* [tini](https://github.com/krallin/tini) as the container entrypoint and [start-notebook.sh](../base-notebook/start-notebook.sh) as the default command * [tini](https://github.com/krallin/tini) as the container entrypoint and [start-notebook.sh](../base-notebook/start-notebook.sh) as the default command
* A [start-singleuser.sh](../base-notebook/start-singleuser.sh) script useful for running a single-user instance of the Notebook server, as required by JupyterHub * A [start-singleuser.sh](../base-notebook/start-singleuser.sh) script useful for running a single-user instance of the Notebook server, as required by JupyterHub