From 10a0d53773da027b74c354399b4dd04f43a04d8e Mon Sep 17 00:00:00 2001 From: Stephen Larson Date: Tue, 29 Nov 2016 15:30:55 -0500 Subject: [PATCH 1/7] add vincent and BeautifulSoup --- scipy-notebook/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index cdbbed6b..6d9b2ba6 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -37,7 +37,9 @@ RUN conda install --quiet --yes \ 'bokeh=0.11*' \ 'sqlalchemy=1.0*' \ 'hdf5=1.8.17' \ - 'h5py=2.6*' && \ + 'h5py=2.6*' \ + 'vincent=0.4.4*' \ + 'BeautifulSoup=4.5.1*' && \ conda remove --quiet --yes --force qt pyqt && \ conda clean -tipsy @@ -69,7 +71,9 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'hdf5=1.8.17' \ 'h5py=2.6*' \ 'sqlalchemy=1.0*' \ - 'pyzmq' && \ + 'pyzmq' \ + 'vincent=0.4.4*' \ + 'BeautifulSoup=4.5.1*'&& \ conda remove -n python2 --quiet --yes --force qt pyqt && \ conda clean -tipsy # Add shortcuts to distinguish pip for python2 and python3 envs From 0d262a78db1f2201a62a0f2e4e64eee300537a24 Mon Sep 17 00:00:00 2001 From: Stephen Larson Date: Tue, 29 Nov 2016 16:00:57 -0500 Subject: [PATCH 2/7] fix beautifulsoup --- scipy-notebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 6d9b2ba6..6887adbf 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -39,7 +39,7 @@ RUN conda install --quiet --yes \ 'hdf5=1.8.17' \ 'h5py=2.6*' \ 'vincent=0.4.4*' \ - 'BeautifulSoup=4.5.1*' && \ + 'beautifulsoup4=4.5.1*' && \ conda remove --quiet --yes --force qt pyqt && \ conda clean -tipsy @@ -73,7 +73,7 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'sqlalchemy=1.0*' \ 'pyzmq' \ 'vincent=0.4.4*' \ - 'BeautifulSoup=4.5.1*'&& \ + 'beautifulsoup4=4.5.1*'&& \ conda remove -n python2 --quiet --yes --force qt pyqt && \ conda clean -tipsy # Add shortcuts to distinguish pip for python2 and python3 envs From 97b59fc3f0bf24c66dc836ec533bbfa5e13ca299 Mon Sep 17 00:00:00 2001 From: Stephen Larson Date: Tue, 29 Nov 2016 16:08:18 -0500 Subject: [PATCH 3/7] Update README.md --- scipy-notebook/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy-notebook/README.md b/scipy-notebook/README.md index e8ee6fbc..2bbaea35 100644 --- a/scipy-notebook/README.md +++ b/scipy-notebook/README.md @@ -6,7 +6,7 @@ * Jupyter Notebook 4.2.x * 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 pre-installed * 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 * 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 From ab4ef258e8c6dc1b211e81b87af3ba32f79d4044 Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Tue, 29 Nov 2016 21:52:07 +0000 Subject: [PATCH 4/7] add xlrd & pip --- scipy-notebook/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 6d9b2ba6..8d4f5ffa 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -8,7 +8,7 @@ USER root # libav-tools for matplotlib anim RUN apt-get update && \ - apt-get install -y --no-install-recommends libav-tools && \ + apt-get install -y --no-install-recommends libav-tools python-pip python-dev build-essential && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -39,7 +39,8 @@ RUN conda install --quiet --yes \ 'hdf5=1.8.17' \ 'h5py=2.6*' \ 'vincent=0.4.4*' \ - 'BeautifulSoup=4.5.1*' && \ + 'beautifulsoup4=4.5.1*' \ + 'xlrd' && \ conda remove --quiet --yes --force qt pyqt && \ conda clean -tipsy @@ -73,7 +74,8 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'sqlalchemy=1.0*' \ 'pyzmq' \ 'vincent=0.4.4*' \ - 'BeautifulSoup=4.5.1*'&& \ + 'beautifulsoup4=4.5.1*' \ + 'xlrd' && \ conda remove -n python2 --quiet --yes --force qt pyqt && \ conda clean -tipsy # Add shortcuts to distinguish pip for python2 and python3 envs From be720a875f1eb7c080d61c9a07539ec6a1b644c7 Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Tue, 29 Nov 2016 22:42:08 +0000 Subject: [PATCH 5/7] modify readme --- scipy-notebook/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy-notebook/README.md b/scipy-notebook/README.md index 2bbaea35..255d05bb 100644 --- a/scipy-notebook/README.md +++ b/scipy-notebook/README.md @@ -6,7 +6,7 @@ * Jupyter Notebook 4.2.x * 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, vincent, beautifulsoup 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` * [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 From 778271650ac089464027ee667150080565a72fee Mon Sep 17 00:00:00 2001 From: Stephen Larson Date: Tue, 29 Nov 2016 18:07:31 -0500 Subject: [PATCH 6/7] removing pip (use conda install instead) --- scipy-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 8d4f5ffa..373b2044 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -8,7 +8,7 @@ USER root # libav-tools for matplotlib anim RUN apt-get update && \ - apt-get install -y --no-install-recommends libav-tools python-pip python-dev build-essential && \ + apt-get install -y --no-install-recommends libav-tools && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* From a3106172f17c261921c533f395c1fa3635b5870e Mon Sep 17 00:00:00 2001 From: EC2 Default User Date: Wed, 30 Nov 2016 03:17:17 +0000 Subject: [PATCH 7/7] removing minor versions from beautifulsoup and vincent --- scipy-notebook/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 373b2044..f2efdbd2 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -38,8 +38,8 @@ RUN conda install --quiet --yes \ 'sqlalchemy=1.0*' \ 'hdf5=1.8.17' \ 'h5py=2.6*' \ - 'vincent=0.4.4*' \ - 'beautifulsoup4=4.5.1*' \ + 'vincent=0.4.*' \ + 'beautifulsoup4=4.5.*' \ 'xlrd' && \ conda remove --quiet --yes --force qt pyqt && \ conda clean -tipsy @@ -73,8 +73,8 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'h5py=2.6*' \ 'sqlalchemy=1.0*' \ 'pyzmq' \ - 'vincent=0.4.4*' \ - 'beautifulsoup4=4.5.1*' \ + 'vincent=0.4.*' \ + 'beautifulsoup4=4.5.*' \ 'xlrd' && \ conda remove -n python2 --quiet --yes --force qt pyqt && \ conda clean -tipsy