From ce2310fc5655175fcc66edd1b0620a0715d2d42a Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 11:43:47 +0100 Subject: [PATCH 1/9] Bump conda to 4.3.11 --- base-notebook/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index fc333816..fd8d751c 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -59,10 +59,10 @@ RUN mkdir /home/$NB_USER/work && \ # Install conda as jovyan RUN cd /tmp && \ mkdir -p $CONDA_DIR && \ - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh && \ - echo "c59b3dd3cad550ac7596e0d599b91e75d88826db132e4146030ef471bb434e9a *Miniconda3-4.2.12-Linux-x86_64.sh" | sha256sum -c - && \ - /bin/bash Miniconda3-4.2.12-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ - rm Miniconda3-4.2.12-Linux-x86_64.sh && \ + wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86_64.sh && \ + echo "b9fe70ce7b6fa8df05abfb56995959b897d0365299f5046063bc236843474fb8 *Miniconda3-4.3.11-Linux-x86_64.sh" | sha256sum -c - && \ + /bin/bash Miniconda3-4.3.11-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ + rm Miniconda3-4.3.11-Linux-x86_64.sh && \ $CONDA_DIR/bin/conda config --system --add channels conda-forge && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ conda clean -tipsy From 1ed4a9bdec18b449bc59f18d309ab6ef92463c27 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 11:49:54 +0100 Subject: [PATCH 2/9] Install patched jupyterhub 0.7.* --- base-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index fd8d751c..f276145a 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -70,7 +70,7 @@ RUN cd /tmp && \ # Install Jupyter Notebook and Hub RUN conda install --quiet --yes \ 'notebook=4.3*' \ - jupyterhub=0.7 \ + jupyterhub=0.7.* \ && conda clean -tipsy USER root From 65fe832c4d295bd1550062744bb96b50fb0acb60 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 11:53:43 +0100 Subject: [PATCH 3/9] Bump notebook to 4.4 --- base-notebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index f276145a..5e52335c 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -69,8 +69,8 @@ RUN cd /tmp && \ # Install Jupyter Notebook and Hub RUN conda install --quiet --yes \ - 'notebook=4.3*' \ - jupyterhub=0.7.* \ + 'notebook=4.4.*' \ + 'jupyterhub=0.7.*' \ && conda clean -tipsy USER root From b3288b4b8e3459fd7613d5a4fc7eec83f5bafb91 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 13:47:04 +0100 Subject: [PATCH 4/9] Bump versions for Python 3.6 --- scipy-notebook/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index f4c006ab..5aada3d0 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -19,23 +19,23 @@ USER $NB_USER # use notebook-friendly backends in these images RUN conda install --quiet --yes \ 'nomkl' \ - 'ipywidgets=5.2*' \ + 'ipywidgets=6.0*' \ 'pandas=0.19*' \ 'numexpr=2.6*' \ 'matplotlib=1.5*' \ - 'scipy=0.17*' \ + 'scipy=0.19*' \ 'seaborn=0.7*' \ 'scikit-learn=0.18*' \ - 'scikit-image=0.11*' \ + 'scikit-image=0.12*' \ 'sympy=1.0*' \ - 'cython=0.23*' \ + 'cython=0.25*' \ 'patsy=0.4*' \ 'statsmodels=0.6*' \ - 'cloudpickle=0.1*' \ + 'cloudpickle=0.2*' \ 'dill=0.2*' \ - 'numba=0.23*' \ - 'bokeh=0.11*' \ - 'sqlalchemy=1.0*' \ + 'numba=0.31*' \ + 'bokeh=0.12*' \ + 'sqlalchemy=1.1*' \ 'hdf5=1.8.17' \ 'h5py=2.6*' \ 'vincent=0.4.*' \ @@ -68,7 +68,7 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'cloudpickle=0.1*' \ 'dill=0.2*' \ 'numba=0.23*' \ - 'bokeh=0.11*' \ + 'bokeh=0.12*' \ 'hdf5=1.8.17' \ 'h5py=2.6*' \ 'sqlalchemy=1.0*' \ From 534fd4a956a960b66b8fb6be7aad1e7e85678ad2 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 13:49:42 +0100 Subject: [PATCH 5/9] Bump statsmodels to 0.8* --- scipy-notebook/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 5aada3d0..4f5c4387 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -30,7 +30,7 @@ RUN conda install --quiet --yes \ 'sympy=1.0*' \ 'cython=0.25*' \ 'patsy=0.4*' \ - 'statsmodels=0.6*' \ + 'statsmodels=0.8*' \ 'cloudpickle=0.2*' \ 'dill=0.2*' \ 'numba=0.31*' \ From 71d8ceb7475cd3f2f42cbaedfa62b5188577d0e2 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 14:09:26 +0100 Subject: [PATCH 6/9] Bumpy Python 2.7 packages too --- scipy-notebook/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index 4f5c4387..be3fdc28 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -52,26 +52,26 @@ RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix # use notebook-friendly backends in these images RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'nomkl' \ - 'ipython=4.2*' \ - 'ipywidgets=5.2*' \ + 'ipython=5.3*' \ + 'ipywidgets=6.0*' \ 'pandas=0.19*' \ 'numexpr=2.6*' \ 'matplotlib=1.5*' \ - 'scipy=0.17*' \ + 'scipy=0.19*' \ 'seaborn=0.7*' \ - 'scikit-learn=0.17*' \ - 'scikit-image=0.11*' \ + 'scikit-learn=0.18*' \ + 'scikit-image=0.12*' \ 'sympy=1.0*' \ - 'cython=0.23*' \ + 'cython=0.25*' \ 'patsy=0.4*' \ - 'statsmodels=0.6*' \ - 'cloudpickle=0.1*' \ + 'statsmodels=0.8*' \ + 'cloudpickle=0.2*' \ 'dill=0.2*' \ - 'numba=0.23*' \ + 'numba=0.31*' \ 'bokeh=0.12*' \ 'hdf5=1.8.17' \ 'h5py=2.6*' \ - 'sqlalchemy=1.0*' \ + 'sqlalchemy=1.1*' \ 'pyzmq' \ 'vincent=0.4.*' \ 'beautifulsoup4=4.5.*' \ From 906c311c7a57685f06cbbfc8235ea67236bd39f0 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 14:12:53 +0100 Subject: [PATCH 7/9] Bump tensorflow to 1.0 --- tensorflow-notebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow-notebook/Dockerfile b/tensorflow-notebook/Dockerfile index 6f0b3c53..71ddb67c 100644 --- a/tensorflow-notebook/Dockerfile +++ b/tensorflow-notebook/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER Jupyter Project USER $NB_USER # Install Python 3 Tensorflow -RUN conda install --quiet --yes 'tensorflow=0.11.0' +RUN conda install --quiet --yes 'tensorflow=1.0*' # Install Python 2 Tensorflow -RUN conda install --quiet --yes -n python2 'tensorflow=0.11.0' +RUN conda install --quiet --yes -n python2 'tensorflow=1.0*' From 7e78c85f3eea668a439aa4d2e5147a70de054a98 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 14:33:31 +0100 Subject: [PATCH 8/9] Bump matplotlib to 2.0 --- scipy-notebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile index be3fdc28..edc56eee 100644 --- a/scipy-notebook/Dockerfile +++ b/scipy-notebook/Dockerfile @@ -22,7 +22,7 @@ RUN conda install --quiet --yes \ 'ipywidgets=6.0*' \ 'pandas=0.19*' \ 'numexpr=2.6*' \ - 'matplotlib=1.5*' \ + 'matplotlib=2.0*' \ 'scipy=0.19*' \ 'seaborn=0.7*' \ 'scikit-learn=0.18*' \ @@ -56,7 +56,7 @@ RUN conda create --quiet --yes -p $CONDA_DIR/envs/python2 python=2.7 \ 'ipywidgets=6.0*' \ 'pandas=0.19*' \ 'numexpr=2.6*' \ - 'matplotlib=1.5*' \ + 'matplotlib=2.0*' \ 'scipy=0.19*' \ 'seaborn=0.7*' \ 'scikit-learn=0.18*' \ From 3f9e3b66c64f9239b1196f9db2200bdb694371cb Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 13 Mar 2017 15:41:53 +0100 Subject: [PATCH 9/9] Revert "Bump conda to 4.3.11" This reverts commit ce2310fc5655175fcc66edd1b0620a0715d2d42a. --- base-notebook/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 5e52335c..7fedb35a 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -59,10 +59,10 @@ RUN mkdir /home/$NB_USER/work && \ # Install conda as jovyan RUN cd /tmp && \ mkdir -p $CONDA_DIR && \ - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.3.11-Linux-x86_64.sh && \ - echo "b9fe70ce7b6fa8df05abfb56995959b897d0365299f5046063bc236843474fb8 *Miniconda3-4.3.11-Linux-x86_64.sh" | sha256sum -c - && \ - /bin/bash Miniconda3-4.3.11-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ - rm Miniconda3-4.3.11-Linux-x86_64.sh && \ + wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.2.12-Linux-x86_64.sh && \ + echo "c59b3dd3cad550ac7596e0d599b91e75d88826db132e4146030ef471bb434e9a *Miniconda3-4.2.12-Linux-x86_64.sh" | sha256sum -c - && \ + /bin/bash Miniconda3-4.2.12-Linux-x86_64.sh -f -b -p $CONDA_DIR && \ + rm Miniconda3-4.2.12-Linux-x86_64.sh && \ $CONDA_DIR/bin/conda config --system --add channels conda-forge && \ $CONDA_DIR/bin/conda config --system --set auto_update_conda false && \ conda clean -tipsy